diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-29 14:01:24 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-29 14:01:24 -0700 |
| commit | 8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4 (patch) | |
| tree | c28e81f015caaaf71f0e587dec2709bb8a081a66 /target/product/core_minimal.mk | |
| parent | 834ec0ead591cf64a5f660af0210e95728e08c4f (diff) | |
| parent | 2267c22b3db95fe0a0d94865c9c69cc51b1a5f70 (diff) | |
| download | build-8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4.zip build-8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4.tar.gz build-8fe9c76d9acbf5a95e8e1d8a151658a8c9bac9f4.tar.bz2 | |
resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp
Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c
Diffstat (limited to 'target/product/core_minimal.mk')
| -rw-r--r-- | target/product/core_minimal.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index f08ca2e..26e868c 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -79,8 +79,7 @@ PRODUCT_BOOT_JARS := \ apache-xml \ webviewchromium -PRODUCT_RUNTIMES := runtime_libdvm_default -PRODUCT_RUNTIMES += runtime_libart +PRODUCT_RUNTIMES := runtime_libart_default PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.zygote=zygote32 |