diff options
| author | Neil Fuller <nfuller@google.com> | 2014-09-04 11:11:56 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-09-04 14:37:41 +0100 |
| commit | 9496b21a11f74959bd8e18836796d6eec77c9f74 (patch) | |
| tree | bd0af430bd310d0b11ad876edf5abf9b4def69d2 /JavaLibrary.mk | |
| parent | ae45925d3a59ae3eb72d70e305d2c1dab5ef6d17 (diff) | |
| download | libcore-9496b21a11f74959bd8e18836796d6eec77c9f74.zip libcore-9496b21a11f74959bd8e18836796d6eec77c9f74.tar.gz libcore-9496b21a11f74959bd8e18836796d6eec77c9f74.tar.bz2 | |
Removing differences between AOSP and internal
These commits were equivalent but not exactly the same:
AOSP commit: adb19b9b603ba83ba49b1a10b6301e396132bf3b
Internal commit: 18e74061b760389a94439f4b14acb376809a44ce
This commit makes the internal files the same as AOSP
to make future diffs easier.
Change-Id: Ie2dcdd3940244c6dd18334b58037d2e8cca93920
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index ff0f6e9..c857390 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -95,7 +95,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core-libart core-junit okhttp +LOCAL_JAVA_LIBRARIES := core-libart okhttp core-junit bouncycastle LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support sqlite-jdbc mockwebserver nist-pkix-tests LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := core-tests @@ -109,7 +109,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core-libart core-junit +LOCAL_JAVA_LIBRARIES := core-libart core-junit bouncycastle LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE := core-tests-support LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk @@ -175,7 +175,8 @@ ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-junit-hostdex core-tests-support-hostdex okhttp-hostdex + LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JAVA_LIBRARIES := core-libart-hostdex okhttp-hostdex bouncycastle-hostdex core-junit-hostdex core-tests-support-hostdex LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional @@ -189,7 +190,8 @@ ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-junit-hostdex + LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JAVA_LIBRARIES := core-libart-hostdex core-junit-hostdex bouncycastle-hostdex LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-support-hostdex |