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

Merge "Disable factory build under PDK" into jb-mr1-aah-dev

Browse Source
This commit is contained in:
Nick Sanders
2012-11-02 18:46:44 -07:00
committed by Android (Google) Code Review
parent 78377bcd1a a1712eea02
commit 9af26dddb3
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tasks/factory_bundle.mk
View File

@@ -15,6 +15,7 @@
# #
ifeq (,$(ONE_SHOT_MAKEFILE)) ifeq (,$(ONE_SHOT_MAKEFILE))
ifneq ($(TARGET_BUILD_PDK),true)
# PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples. # PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples.
# <install_path> is relative to the staging directory for the bundle. # <install_path> is relative to the staging directory for the bundle.
@@ -76,5 +77,6 @@ INSTALLED_FACTORY_BUNDLE_TARGET := $(tarball)
endif endif
endif # TARGET_BUILD_PDK
endif # ONE_SHOT_MAKEFILE endif # ONE_SHOT_MAKEFILE

2
core/tasks/factory_ramdisk.mk
View File

@@ -15,6 +15,7 @@
# #
ifeq (,$(ONE_SHOT_MAKEFILE)) ifeq (,$(ONE_SHOT_MAKEFILE))
ifneq ($(TARGET_BUILD_PDK),true)
# PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples. # PRODUCT_FACTORY_RAMDISK_MODULES consists of "<module_name>:<install_path>[:<install_path>...]" tuples.
# <install_path> is relative to TARGET_FACTORY_RAMDISK_OUT. # <install_path> is relative to TARGET_FACTORY_RAMDISK_OUT.
@@ -87,4 +88,5 @@ $(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTIMG) $(TARGET_RAMDISK_KERNEL) $(IN
endif endif
endif # TARGET_BUILD_PDK
endif # ONE_SHOT_MAKEFILE endif # ONE_SHOT_MAKEFILE