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

Commit 777cf2c4 authored by Jeff Gaston's avatar Jeff Gaston Committed by Colin Cross
Browse files

Revert "Use AAPT2 by default" 

This reverts commit ba7699fb.

Reason for revert: Broke boot tests on walleye and taimen

Bug: 80142285
Change-Id: Ida54a0b875147420e6e9c0af41b14af50f6397e3
parent ba7699fb

core/force_aapt2.mk

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

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



ifneq ($(FORCE_AAPT2),false)

ifeq ($(FORCE_AAPT2),true)

  ifeq ($(LOCAL_USE_AAPT2),)

    # Force AAPT2 on

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

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

        # 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

        $(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))

      endif