diff options
| author | Ying Wang <wangying@google.com> | 2010-06-02 13:09:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-02 13:09:12 -0700 |
| commit | b93e03cbc9d47a9d9a385c780ed64639e2a23ae5 (patch) | |
| tree | 8b61db92e6ece51034ed67c20612b0ad90f1f3e7 /target | |
| parent | 0c5363c8571eef11eeb21a575da941565c34191e (diff) | |
| parent | 529113098350c026ec521258d4c6fba51f285a48 (diff) | |
| download | build-b93e03cbc9d47a9d9a385c780ed64639e2a23ae5.zip build-b93e03cbc9d47a9d9a385c780ed64639e2a23ae5.tar.gz build-b93e03cbc9d47a9d9a385c780ed64639e2a23ae5.tar.bz2 | |
am 52911309: Cherry-pick unbundled build changes from master
Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp
* commit '529113098350c026ec521258d4c6fba51f285a48':
Cherry-pick unbundled build changes from master
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/AndroidProducts.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index be874c6..df2fca1 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -25,6 +25,12 @@ # it includes. # +ifeq ($(strip $(is_unbundled_app_build)),true) +# An unbundled app build needs only generic.mk. +PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/core.mk \ + $(LOCAL_DIR)/generic.mk +else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ $(LOCAL_DIR)/generic.mk \ @@ -32,3 +38,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sim.mk +endif |