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

Commit 872accd1 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d7 

am: da6fcd1f

Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8
parents 59e792ba da6fcd1f

packages/CtsShim/build/Android.mk

+8 −6
Original line number Diff line number Diff line
@@ -66,10 +66,11 @@ LOCAL_FULL_MANIFEST_FILE := $(gen) 
LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



# Disable AAPT2 to fix:

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): 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 $(BUILD_PACKAGE)
@@ -111,10 +112,11 @@ LOCAL_PACKAGE_NAME := CtsShim 


LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml



# Disable AAPT2 to fix:

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): 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 $(BUILD_PACKAGE)

tests/ActivityTests/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ LOCAL_PRIVATE_PLATFORM_APIS := true 
LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



# Disable AAPT2 to fix:

LOCAL_USE_AAPT2 := true

# Disable AAPT2 manifest checks to fix:

# frameworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element <preferred> found in <manifest><application><activity>.

# 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 $(BUILD_PACKAGE)