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

Commit 9428a922 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Remove workarounds for b/79755007

am: f5c86dc1

Change-Id: I5bb981fdf807749c88492dfb2c24ea8b936992cf
parents 732463d0 f5c86dc1
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -67,10 +67,6 @@ LOCAL_RESOURCE_DIR := $(FrameworkCoreTests_intermediates) $(LOCAL_PATH)/res


# Disable AAPT2 because the hacks below depend on the AAPT rules implementation
# Disable AAPT2 because the hacks below depend on the AAPT rules implementation
LOCAL_USE_AAPT2 := false
LOCAL_USE_AAPT2 := false
# When AAPT2 is enabled it will need --warn-manifest-validation to fix:
# frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unknown element <meta-data> found.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
# LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)
# Rules to copy all the test apks to the intermediate raw resource directory
# Rules to copy all the test apks to the intermediate raw resource directory
+0 −4
Original line number Original line Diff line number Diff line
@@ -8,10 +8,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := install_multi_package
LOCAL_PACKAGE_NAME := install_multi_package


LOCAL_USE_AAPT2 := true
LOCAL_USE_AAPT2 := true
# Disable AAPT2 manifest checks to fix:
# frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element <package> found in <manifest>.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(FrameworkCoreTests_BUILD_PACKAGE)
include $(FrameworkCoreTests_BUILD_PACKAGE)
#include $(BUILD_PACKAGE)
#include $(BUILD_PACKAGE)
+0 −4
Original line number Original line Diff line number Diff line
@@ -6,9 +6,5 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := install_verifier_bad
LOCAL_PACKAGE_NAME := install_verifier_bad


LOCAL_USE_AAPT2 := true
LOCAL_USE_AAPT2 := true
# Disable AAPT2 manifest checks to fix:
# frameworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(FrameworkCoreTests_BUILD_PACKAGE)
include $(FrameworkCoreTests_BUILD_PACKAGE)
+0 −4
Original line number Original line Diff line number Diff line
@@ -6,9 +6,5 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := install_verifier_good
LOCAL_PACKAGE_NAME := install_verifier_good


LOCAL_USE_AAPT2 := true
LOCAL_USE_AAPT2 := true
# Disable AAPT2 manifest checks to fix:
# frameworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(FrameworkCoreTests_BUILD_PACKAGE)
include $(FrameworkCoreTests_BUILD_PACKAGE)
+0 −8
Original line number Original line Diff line number Diff line
@@ -67,10 +67,6 @@ LOCAL_MULTILIB := both
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni


LOCAL_USE_AAPT2 := true
LOCAL_USE_AAPT2 := true
# Disable AAPT2 manifest checks to fix:
# out/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


@@ -113,10 +109,6 @@ LOCAL_PACKAGE_NAME := CtsShim
LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml
LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml


LOCAL_USE_AAPT2 := true
LOCAL_USE_AAPT2 := true
# Disable AAPT2 manifest checks to fix:
# frameworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
LOCAL_AAPT_FLAGS += --warn-manifest-validation


include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


Loading