diff options
| author | Ed Heyl <ed@google.com> | 2011-03-05 09:31:29 -0800 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-03-05 09:31:29 -0800 |
| commit | 8e84514ef5be727edfa95e1f99d7b87943b7837f (patch) | |
| tree | 44d07513e02fcad3f8e64771a238d012af8d28f9 /target/product/AndroidProducts.mk | |
| parent | 54056ffc52f2b623e18c9a01dce2a6ddee049ecc (diff) | |
| parent | 51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4 (diff) | |
| download | build-8e84514ef5be727edfa95e1f99d7b87943b7837f.zip build-8e84514ef5be727edfa95e1f99d7b87943b7837f.tar.gz build-8e84514ef5be727edfa95e1f99d7b87943b7837f.tar.bz2 | |
resolved conflicts for merge of 51de6437 to honeycomb-plus-aosp
Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e
Diffstat (limited to 'target/product/AndroidProducts.mk')
| -rw-r--r-- | target/product/AndroidProducts.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index bcd16a2..fafd222 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -40,6 +40,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ + $(LOCAL_DIR)/sdk_x86.mk \ $(LOCAL_DIR)/sim.mk \ $(LOCAL_DIR)/large_emu_hw.mk endif |