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

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

Export AAPT-related variables to soong 

Test: m checkbuild
Change-Id: I1816df9b9cc7b51e228d6d847cefa2d51a524897
parent d5cce4c3

core/config.mk

+11 −0
Original line number Diff line number Diff line
@@ -844,6 +844,17 @@ RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcomp 
RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20

RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13



# Add BUILD_NUMBER to apps default version name if it's unbundled build.

ifdef TARGET_BUILD_APPS

TARGET_BUILD_WITH_APPS_VERSION_NAME := true

endif



ifdef TARGET_BUILD_WITH_APPS_VERSION_NAME

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)

else

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)

endif



ifeq ($(JAVA_NOT_REQUIRED),true)

# Remove java and tools from our path so that we make sure nobody uses them.

unexport ANDROID_JAVA_HOME

core/definitions.mk

+0 −11
Original line number Diff line number Diff line
@@ -2002,17 +2002,6 @@ endef 
## Commands for running javac to make .class files

###########################################################



# Add BUILD_NUMBER to apps default version name if it's unbundled build.

ifdef TARGET_BUILD_APPS

TARGET_BUILD_WITH_APPS_VERSION_NAME := true

endif



ifdef TARGET_BUILD_WITH_APPS_VERSION_NAME

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)

else

APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)

endif



# b/37750224

AAPT_ASAN_OPTIONS := ASAN_OPTIONS=detect_leaks=0

core/soong_config.mk

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ $(call add_json_str, CrossHost, $(HOST_CROSS_OS)) 
$(call add_json_str,  CrossHostArch,                     $(HOST_CROSS_ARCH))

$(call add_json_str,  CrossHostSecondaryArch,            $(HOST_CROSS_2ND_ARCH))



$(call add_json_list, ResourceOverlays,                  $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))

$(call add_json_list, EnforceRROTargets,                 $(PRODUCT_ENFORCE_RRO_TARGETS))

$(call add_json_list, EnforceRROExcludedOverlays,        $(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS))



$(call add_json_str,  AAPTCharacteristics,               $(TARGET_AAPT_CHARACTERISTICS))

$(call add_json_list, AAPTConfig,                        $(PRODUCT_AAPT_CONFIG))

$(call add_json_str,  AAPTPreferredConfig,               $(PRODUCT_AAPT_PREF_CONFIG))

$(call add_json_list, AAPTPrebuiltDPI,                   $(PRODUCT_AAPT_PREBUILT_DPI))



$(call add_json_str,  AppsDefaultVersionName,            $(APPS_DEFAULT_VERSION_NAME))



$(call add_json_list, SanitizeHost,                      $(SANITIZE_HOST))

$(call add_json_list, SanitizeDevice,                    $(SANITIZE_TARGET))

$(call add_json_list, SanitizeDeviceDiag,                $(SANITIZE_TARGET_DIAG))