diff options
| author | Keun young Park <keunyoung@google.com> | 2012-04-20 12:02:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 12:02:34 -0700 |
| commit | 27f8946d2db5c5025496bb0471ba351cc1d758fa (patch) | |
| tree | ddd295d50b10cde75aa5f97dd59ce133e648e646 | |
| parent | e8e50739dab7aef271e3c64e512c6c3605b9fde6 (diff) | |
| parent | 9283168e61a4991d39a6c599627eefc45d41c099 (diff) | |
| download | build-27f8946d2db5c5025496bb0471ba351cc1d758fa.zip build-27f8946d2db5c5025496bb0471ba351cc1d758fa.tar.gz build-27f8946d2db5c5025496bb0471ba351cc1d758fa.tar.bz2 | |
Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
| -rw-r--r-- | core/java.mk | 8 | ||||
| -rw-r--r-- | core/pdk_config.mk | 8 | ||||
| -rw-r--r-- | tools/Android.mk | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index b302c9f..4005ce3 100644 --- a/core/java.mk +++ b/core/java.mk @@ -3,6 +3,14 @@ # LOCAL_MODULE_CLASS # all_res_assets +ifeq ($(TARGET_BUILD_PDK),true) +# LOCAL_SDK not defined or set to current +ifeq ($(filter-out current,$(LOCAL_SDK_VERSION)),) +LOCAL_SDK_VERSION := $(PDK_BUILD_SDK_VERSION) +endif +endif #PDK + + # Make sure there's something to build. # It's possible to build a package that doesn't contain any classes. ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES))) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 98f34a5..8e3f1bb 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -64,3 +64,11 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list)) endif + +ifeq ($(TARGET_BUILD_PDK),true) + +# SDK used for Java build under PDK +PDK_BUILD_SDK_VERSION := $(lastword $(TARGET_AVAILABLE_SDK_VERSIONS)) +$(info PDK Build uses SDK $(PDK_BUILD_SDK_VERSION)) + +endif # BUILD_PDK diff --git a/tools/Android.mk b/tools/Android.mk index 92603f5..fe29e2b 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) # If we're building only unbundled apps, this is the only tool we need. -ifneq ($(TARGET_BUILD_APPS),) +ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) include $(LOCAL_PATH)/signapk/Android.mk else include $(call first-makefiles-under,$(LOCAL_PATH)) |