diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-18 19:25:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-18 19:25:30 -0700 |
| commit | 55fa2ea206d89bbebfa3aa697437ae82b71faa22 (patch) | |
| tree | 2391fede304727b82202dd09d91b5d5f8795f6d0 /target | |
| parent | 0df5e7270b2b63f3e5955db9b34971a8d9094107 (diff) | |
| parent | 8fd9944e8fc219347858be367f51736e9a1ef341 (diff) | |
| download | build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.zip build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.gz build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.bz2 | |
resolved conflicts for merge of 8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/core_minimal.mk | 2 | ||||
| -rw-r--r-- | target/product/core_tiny.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 8740d80..368e468 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -76,7 +76,7 @@ PRODUCT_COPY_FILES += \ # The order of PRODUCT_BOOT_JARS matters. PRODUCT_BOOT_JARS := \ - core \ + core-libart \ conscrypt \ okhttp \ core-junit \ diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 856924c..affef3c 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -77,7 +77,7 @@ PRODUCT_PACKAGES += \ # The order matters PRODUCT_BOOT_JARS := \ - core \ + core-libart \ conscrypt \ okhttp \ core-junit \ |