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

Commit b3c1814b authored by Colin Cross's avatar Colin Cross
Browse files

Use AAPT2 for modules with manifest validation errors 

Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.

Bug: 79755007
Test: m checkbuild
Change-Id: I357fcba75909495ba2b46b9ed1b532e65fee3fe1
parent 61f92e7e

core/tests/coretests/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -49,10 +49,12 @@ LOCAL_CERTIFICATE := platform 
FrameworkCoreTests_intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/test_apks/res

LOCAL_RESOURCE_DIR := $(FrameworkCoreTests_intermediates) $(LOCAL_PATH)/res



# Disable AAPT2 to fix:

# frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unknown element <meta-data> found.

# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.

# Disable AAPT2 because the hacks below depend on the AAPT rules implementation

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)

# Rules to copy all the test apks to the intermediate raw resource directory

core/tests/coretests/apks/install_multi_package/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 


LOCAL_PACKAGE_NAME := install_multi_package



# Disable AAPT2 to fix:

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): Re-enable AAPT2 when it supports the missing features.

LOCAL_USE_AAPT2 := false

# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.

LOCAL_AAPT_FLAGS += --warn-manifest-validation



include $(FrameworkCoreTests_BUILD_PACKAGE)

#include $(BUILD_PACKAGE)

core/tests/coretests/apks/install_verifier_bad/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -5,9 +5,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 


LOCAL_PACKAGE_NAME := install_verifier_bad



# Disable AAPT2 to fix:

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): Re-enable AAPT2 when it supports the missing features.

LOCAL_USE_AAPT2 := false

# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.

LOCAL_AAPT_FLAGS += --warn-manifest-validation



include $(FrameworkCoreTests_BUILD_PACKAGE)

core/tests/coretests/apks/install_verifier_good/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -5,9 +5,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 


LOCAL_PACKAGE_NAME := install_verifier_good



# Disable AAPT2 to fix:

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): Re-enable AAPT2 when it supports the missing features.

LOCAL_USE_AAPT2 := false

# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.

LOCAL_AAPT_FLAGS += --warn-manifest-validation



include $(FrameworkCoreTests_BUILD_PACKAGE)