Merge "Build: Bring back SDK dependencies"

am: eb06c77b80

Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
This commit is contained in:
Andreas Gampe
2016-11-18 02:57:28 +00:00
committed by android-build-merger

View File

@@ -64,13 +64,19 @@ PRODUCT_PACKAGES += \
ahat \ ahat \
dexdump \ dexdump \
dexlist \ dexlist \
hprof-conv \
oatdump \ oatdump \
# Certificates. # Certificates.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
cacerts \ cacerts \
# SDK dependencies. WHY ARE THEY HERE?!?!
PRODUCT_PACKAGES += \
hprof-conv \
dexdeps \
dmtracedump \
dx \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
dalvik.vm.image-dex2oat-Xms=64m \ dalvik.vm.image-dex2oat-Xms=64m \
dalvik.vm.image-dex2oat-Xmx=64m \ dalvik.vm.image-dex2oat-Xmx=64m \