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

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

Merge "Remove unused Android.mk in NamespaceTest" into main am: 3cf2db8a am: d2f3837d 

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



Change-Id: I8468da51b36f79181c16f47a1b850077e9afb581
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f2f93f5 d2f3837d

tools/aapt2/integration-tests/NamespaceTest/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/NamespaceTest/App/Android.mk

deleted100644 → 0
+0 −33
Original line number 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_AAPT_NAMESPACES := true

LOCAL_PACKAGE_NAME := AaptTestNamespace_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_SRC_FILES := $(call all-java-files-under,src)

LOCAL_STATIC_ANDROID_LIBRARIES := \

    AaptTestNamespace_LibOne \

    AaptTestNamespace_LibTwo

include $(BUILD_PACKAGE)

tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk

deleted100644 → 0
+0 −33
Original line number 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_AAPT_NAMESPACES := true

LOCAL_MODULE := AaptTestNamespace_LibOne

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



# We need this to retain the R.java generated for this library.

LOCAL_JAR_EXCLUDE_FILES := none

include $(BUILD_STATIC_JAVA_LIBRARY)

tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk

deleted100644 → 0
+0 −34
Original line number 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_AAPT_NAMESPACES := true

LOCAL_MODULE := AaptTestNamespace_LibTwo

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_SRC_FILES := $(call all-java-files-under,src)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_MIN_SDK_VERSION := 21



# We need this to retain the R.java generated for this library.

LOCAL_JAR_EXCLUDE_FILES := none

include $(BUILD_STATIC_JAVA_LIBRARY)

tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk

deleted100644 → 0
+0 −32
Original line number 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_AAPT_NAMESPACES := true

LOCAL_PACKAGE_NAME := AaptTestNamespace_Split

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_SRC_FILES := $(call all-java-files-under,src)

LOCAL_APK_LIBRARIES := AaptTestNamespace_App

LOCAL_RES_LIBRARIES := AaptTestNamespace_App

LOCAL_AAPT_FLAGS := --package-id 0x80 --rename-manifest-package com.android.aapt.namespace.app

include $(BUILD_PACKAGE)