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

Commit 7ac51097 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unused Android.mk in MergeOnlyTest" into main am: 51ecc069 am:... 

Merge "Remove unused Android.mk in MergeOnlyTest" into main am: 51ecc069 am: 53acc5b1 am: 90978a84

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2905927



Change-Id: I84b2c4b0b72171b38af03abe9197e5f96e37a9b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb79690b 90978a84

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

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

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

tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 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_AAPT_NAMESPACES := true

LOCAL_PACKAGE_NAME := AaptTestMergeOnly_App

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_EXPORT_PACKAGE_RESOURCES := true

LOCAL_MODULE_TAGS := tests

LOCAL_STATIC_ANDROID_LIBRARIES := \

    AaptTestMergeOnly_LeafLib \

    AaptTestMergeOnly_LocalLib

include $(BUILD_PACKAGE)

tools/aapt2/integration-tests/MergeOnlyTest/LeafLib/Android.mk

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 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_AAPT_NAMESPACES := true

LOCAL_MODULE := AaptTestMergeOnly_LeafLib

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_MODULE_TAGS := tests

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_MIN_SDK_VERSION := 21

LOCAL_AAPT_FLAGS := --merge-only

include $(BUILD_STATIC_JAVA_LIBRARY)

tools/aapt2/integration-tests/MergeOnlyTest/LocalLib/Android.mk

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
//

// Copyright (C) 2019 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_AAPT_NAMESPACES := true

LOCAL_MODULE := AaptTestMergeOnly_LocalLib

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_MODULE_TAGS := tests

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_MIN_SDK_VERSION := 21

LOCAL_AAPT_FLAGS := --merge-only

include $(BUILD_STATIC_JAVA_LIBRARY)