Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efa1d265 authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Convert Android.mk file to Android.bp" 

am: a81d64e9

Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e
parents c423836b a81d64e9

tools/aapt2/integration-tests/Android.mk

deleted100644 → 0
+0 −2
Original line number Original line Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(call all-makefiles-under,$(LOCAL_PATH))

tools/aapt2/integration-tests/AutoVersionTest/Android.bp

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



android_test {

    name: "AaptAutoVersionTest",

    sdk_version: "current",

}

tools/aapt2/integration-tests/AutoVersionTest/Android.mk

deleted100644 → 0
+0 −24
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := AaptAutoVersionTest

LOCAL_SDK_VERSION := current

LOCAL_MODULE_TAGS := tests

include $(BUILD_PACKAGE)

tools/aapt2/integration-tests/BasicTest/Android.bp

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



android_test {

    name: "AaptBasicTest",

    sdk_version: "current",

}

tools/aapt2/integration-tests/BasicTest/Android.mk

deleted100644 → 0
+0 −24
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_PACKAGE_NAME := AaptBasicTest

LOCAL_SDK_VERSION := current

LOCAL_MODULE_TAGS := tests

include $(BUILD_PACKAGE)