commit b8901d7fb8c4ea8b829fdbc2da127568436d6b2a
author Colin Cross <ccross@android.com> Fri Dec 14 11:49:49 2018 -0800
committer Colin Cross <ccross@android.com> Fri Dec 14 11:49:55 2018 -0800
tree ed335d7f6ea35b7ed8afda093d9f3e55473044e2
parent 7f9ccd53d79d6eb4bfae1e9d2a1300bdf79a361e

Revert "Move dexpreopting to Soong"

This reverts commit e736c58043290dad18ddbd690d554cdc413157a8.

Test: none
Bug: 119412419

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 9587b64..279a612 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -13,10 +13,10 @@
 endif
 endif
 
-include $(BUILD_SYSTEM)/dex_preopt_config.mk
-
 ifeq ($(WRITE_SOONG_VARIABLES),true)
 
+include $(BUILD_SYSTEM)/json.mk
+
 # Create soong.variables with copies of makefile settings.  Runs every build,
 # but only updates soong.variables if it changes
 $(shell mkdir -p $(dir $(SOONG_VARIABLES)))
@@ -106,13 +106,11 @@
 $(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))
 $(call add_json_bool, Malloc_not_svelte,                 $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))
 $(call add_json_str,  Override_rs_driver,                $(OVERRIDE_RS_DRIVER))
-
 $(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))))
 $(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
-
+$(call add_json_bool, DefaultStripDex,                   $(call invert_bool,$(filter nostripping,$(DEX_PREOPT_DEFAULT))))
 $(call add_json_bool, DisableDexPreopt,                  $(filter false,$(WITH_DEXPREOPT)))
 $(call add_json_list, DisableDexPreoptModules,           $(DEXPREOPT_DISABLED_MODULES))
-$(call add_json_str,  DexPreoptProfileDir,               $(PRODUCT_DEX_PREOPT_PROFILE_DIR))
 
 $(call add_json_bool, Product_is_iot,                    $(filter true,$(PRODUCT_IOT)))
 
@@ -141,8 +139,6 @@
 
 $(call add_json_bool, FlattenApex,                       $(filter true,$(TARGET_FLATTEN_APEX)))
 
-$(call add_json_str,  DexpreoptGlobalConfig,             $(DEX_PREOPT_CONFIG))
-
 $(call add_json_map, VendorVars)
 $(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\
   $(call add_json_map, $(namespace))\