Merge "Move comments to the previous line" (906a3ea5) · Commits · e / os / android_build

core/clear_vars.mk

+10 −5

Original line number	Diff line number	Diff line
		@@ -2,7 +2,8 @@
		## Clear out values of all variables used by rule templates.
		###########################################################

		LOCAL_32_BIT_ONLY:= # '',true
		# '',true
		LOCAL_32_BIT_ONLY:=
		LOCAL_AAPT_FLAGS:=
		LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=
		LOCAL_ADDITIONAL_CERTIFICATES:=
		@@ -99,7 +100,8 @@ LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=
		LOCAL_JACK_CLASSPATH:=
		LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=
		LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=
		LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental
		# '' (ie disabled), disabled, full, incremental
		LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED)
		LOCAL_JACK_FLAGS:=
		LOCAL_JACK_PLUGIN:=
		LOCAL_JACK_PLUGIN_PATH:=
		@@ -178,12 +180,14 @@ LOCAL_PREBUILT_OBJ_FILES:=
		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=
		LOCAL_PREBUILT_STRIP_COMMENTS:=
		LOCAL_PRIVILEGED_MODULE:=
		LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization
		# '',full,custom,nosystem,disabled,obfuscation,optimization
		LOCAL_PROGUARD_ENABLED:=
		LOCAL_PROGUARD_FLAG_FILES:=
		LOCAL_PROGUARD_FLAGS:=
		LOCAL_PROPRIETARY_MODULE:=
		LOCAL_PROTOC_FLAGS:=
		LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full,nanopb-c,nanopb-c-enable_malloc
		# lite(default),micro,nano,full,nanopb-c,nanopb-c-enable_malloc
		LOCAL_PROTOC_OPTIMIZE_TYPE:=
		LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
		LOCAL_RECORDED_MODULE_TYPE:=
		LOCAL_RENDERSCRIPT_CC:=
		@@ -208,7 +212,8 @@ LOCAL_SDK_RES_VERSION:=
		LOCAL_SDK_VERSION:=
		LOCAL_SHARED_ANDROID_LIBRARIES:=
		LOCAL_SHARED_LIBRARIES:=
		LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
		# '',true
		LOCAL_SOURCE_FILES_ALL_GENERATED:=
		LOCAL_SRC_FILES:=
		LOCAL_SRC_FILES_EXCLUDE:=
		LOCAL_STATIC_ANDROID_LIBRARIES:=