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

Commit 5b89ec4d authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Revert "Use AAPT2 by default"" 

This reverts commit 777cf2c4.

Reason for revert: manifest merger is used for libraries forced to aapt2 now

Bug: 79481102
Test: m checkbuild
Change-Id: I9b67fd2a9b3234798b2aac879b5242c2097b3863
parent cf5180c1

core/force_aapt2.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
# Including this makefile will force AAPT2 on if FORCE_AAPT2==true,

# Including this makefile will force AAPT2 on if FORCE_AAPT2==true,

# rewriting some properties to convert standard AAPT usage to AAPT2.

# rewriting some properties to convert standard AAPT usage to AAPT2.





ifeq ($(FORCE_AAPT2),true)

ifneq ($(FORCE_AAPT2),false)

  ifeq ($(LOCAL_USE_AAPT2),)

  ifeq ($(LOCAL_USE_AAPT2),)

    # Force AAPT2 on

    # Force AAPT2 on

    LOCAL_USE_AAPT2 := true

    LOCAL_USE_AAPT2 := true
@@ -47,7 +47,6 @@ ifeq ($(FORCE_AAPT2),true) 
    ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))

    ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))

      ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))

      ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))

        # work around missing manifests by creating a default one

        # work around missing manifests by creating a default one

        $(call pretty-warning, Missing manifest file)

        LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml

        LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml

        ifdef LOCAL_MIN_SDK_VERSION

        ifdef LOCAL_MIN_SDK_VERSION

          my_manifest_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)

          my_manifest_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)