commit 55962973c156e2f19dfc8681b1314cbf69d46107
author Narayan Kamath <narayan@google.com> Thu Oct 01 15:54:46 2015 +0000
committer Narayan Kamath <narayan@google.com> Thu Nov 12 10:51:41 2015 +0000
tree 3bd727f46f4141ebff1f45139e4aeecc5d06b39d
parent 8ca24bf8db893b686819d5b557c85909b9520705

Revert "Followup to change 2cd01bd959719192b9666."

This reverts commit 06772e8067ae6230e907dffc9fe1384c678fb409.

Change-Id: I2b672183ee12a1cb09fb883590e3ca1216ad91e4

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 6c44485..b9ffc2c 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -149,7 +149,7 @@
 LOCAL_DX_FLAGS := --core-library
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-oj
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk core-all
 ifeq ($(ANDROID_DISABLE_CORE_OBFUSCATION),)
 LOCAL_PROGUARD_ENABLED := obfuscation nosystem
 LOCAL_PROGUARD_FLAGS := $(core_proguard_obfuscation_flags)