diff options
| author | Keun young Park <keunyoung@google.com> | 2012-04-19 15:36:18 -0700 |
|---|---|---|
| committer | Keun young Park <keunyoung@google.com> | 2012-04-20 10:07:31 -0700 |
| commit | 9283168e61a4991d39a6c599627eefc45d41c099 (patch) | |
| tree | 3ce71bde4c0e9cc3dad2768401a67b2e68374fbe | |
| parent | 782610165fc0a23dee93d6a297746e284edbb7ea (diff) | |
| download | build-9283168e61a4991d39a6c599627eefc45d41c099.tar.gz build-9283168e61a4991d39a6c599627eefc45d41c099.tar.bz2 build-9283168e61a4991d39a6c599627eefc45d41c099.zip | |
enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK
Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
| -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 b302c9f5f..4005ce3a1 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 98f34a5ad..8e3f1bbd8 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 92603f5fe..fe29e2b15 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)) |