summaryrefslogtreecommitdiffstats
path: root/core/java.mk
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-07-17 20:29:51 -0700
committerJeff Brown <jeffbrown@google.com>2013-07-17 21:08:18 -0700
commitae859f9b64fd1740471e94f3417f63f4082a2e02 (patch)
tree28458ee45aae79254080f721886704e7bf65fd29 /core/java.mk
parent0a2c858bb650f3daca550bf26d17286ecee56cd8 (diff)
downloadbuild-ae859f9b64fd1740471e94f3417f63f4082a2e02.zip
build-ae859f9b64fd1740471e94f3417f63f4082a2e02.tar.gz
build-ae859f9b64fd1740471e94f3417f63f4082a2e02.tar.bz2
Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
Diffstat (limited to 'core/java.mk')
-rw-r--r--core/java.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk
index 5315ccc..c7e93b7 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,7 +43,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif
else
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
- LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES)
+ LOCAL_JAVA_LIBRARIES := core core-junit ext framework framework2 $(LOCAL_JAVA_LIBRARIES)
endif
endif
@@ -337,6 +337,7 @@ $(full_classes_compiled_jar): PRIVATE_WARNINGS_ENABLE := $(LOCAL_WARNINGS_ENABLE
# via deps on the target that generates the sources.
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
+$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)
$(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \
$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \