am 278dbf3c: am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev

* commit '278dbf3c6be3ba3149190823ea1028667059a24d':
  Disable factory build under PDK
This commit is contained in:
Nick Sanders 2012-11-02 18:51:39 -07:00 committed by Android Git Automerger
commit 1a849d4f2e
2 changed files with 4 additions and 0 deletions

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

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