StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing target-api option from build.

Browse Source 
This is cherry-picked from dalvik-dev.

Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
This commit is contained in:
jeffhao
2011-08-23 14:18:24 -07:00
parent 9d78854f0f
commit ca94f3583f
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java.mk
View File

@@ -349,23 +349,6 @@ ALL_MODULES.$(LOCAL_MODULE).PROGUARD_ENABLED:=$(LOCAL_PROGUARD_ENABLED)
# Override PRIVATE_INTERMEDIATES_DIR so that install-dex-debug # Override PRIVATE_INTERMEDIATES_DIR so that install-dex-debug
# will work even when intermediates != intermediates.COMMON. # will work even when intermediates != intermediates.COMMON.
$(built_dex_intermediate): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON) $(built_dex_intermediate): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)
ifeq (,$(filter --target-api=%, $(LOCAL_DX_FLAGS)))
possible_dx_target_api :=
ifneq (,$(LOCAL_MANIFEST_FILE))
manifest_min_sdk_version := \
$(shell grep -o 'android:minSdkVersion="[0-9]\{1,\}"' $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) 2>/dev/null)
possible_dx_target_api := $(patsubst android:minSdkVersion="%",%,$(firstword $(manifest_min_sdk_version)))
endif
ifeq (,$(possible_dx_target_api))
# In case minSdkVersion is not available, eg shared library built against SDK,
# LOCAL_SDK_VERSION may be a good guess
ifneq (,$(filter-out current, $(LOCAL_SDK_VERSION)))
possible_dx_target_api := $(LOCAL_SDK_VERSION)
endif
endif
LOCAL_DX_FLAGS += $(addprefix --target-api=, $(possible_dx_target_api))
endif # --target-api not defined in LOCAL_DX_FLAGS
$(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
# If you instrument class files that have local variable debug information in # If you instrument class files that have local variable debug information in
# them emma does not correctly maintain the local variable table. # them emma does not correctly maintain the local variable table.