OSDN Git Service

am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests...
authorYing Wang <wangying@google.com>
Thu, 16 Sep 2010 00:53:22 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 00:53:22 +0000 (17:53 -0700)
Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
  Change "make PRODUCT-XXX-tests" to build only tests-build-target

1  2 
core/Makefile
core/main.mk

diff --cc core/Makefile
@@@ -872,10 -861,8 +872,8 @@@ $(INSTALLED_USERDATAIMAGE_TARGET): $(IN
        $(build-userdataimage-target)
  
  .PHONY: userdataimage-nodeps
 -userdataimage-nodeps: $(INTERNAL_USERIMAGES_DEPS)
 +userdataimage-nodeps: $(INTERNAL_USERIMAGES_DEPS)
        $(build-userdataimage-target)
-       $(hide)mkdir -p $(DIST_DIR)
-       $(hide)cp $(INSTALLED_USERDATAIMAGE_TARGET) $(DIST_DIR)
  
  #######
  ## data partition tarball
diff --cc core/main.mk
Simple merge