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

resolved conflicts for merge of 56791ebe to master

Browse Source 
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
This commit is contained in:
Ying Wang
2010-06-15 15:43:13 -07:00
parent 8004266329 56791ebe26
commit f9cd36a0f7
8 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/Android.mk
View File

@@ -16,7 +16,8 @@
LOCAL_PATH := $(my-dir)
ifeq ($(strip $(is_unbundled_app_build)),true)
# If we're building only unbundled apps, this is the only tool we need.
ifneq ($(TARGET_BUILD_APPS),)
include $(LOCAL_PATH)/signapk/Android.mk
else
include $(call first-makefiles-under,$(LOCAL_PATH))

7
tools/signapk/Android.mk
View File

@@ -23,5 +23,8 @@ LOCAL_SRC_FILES := SignApk.java
LOCAL_JAR_MANIFEST := SignApk.mf
include $(BUILD_HOST_JAVA_LIBRARY)
# The post-build signing tools need signapk.jar.
$(call dist-for-goals,droid,$(LOCAL_INSTALLED_MODULE))
ifeq ($(TARGET_BUILD_APPS),)
# The post-build signing tools need signapk.jar, but we don't
# need this if we're just doing unbundled apps.
$(call dist-for-goals,droidcore,$(LOCAL_INSTALLED_MODULE))
endif