Build system API stubs.
Run "make android_system_stubs" to build the system API jar file.
Change-Id: I0c221e110683f9315f4082e68ed3835162f91320
diff --git a/build/Android.mk b/build/Android.mk
index b815bf7..e91ff98 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -1,3 +1,5 @@
+LOCAL_PATH := $(call my-dir)
+
# ===== SDK source.property files =====
# Add all files to be generated from the source.prop templates to the SDK pre-requisites
@@ -52,53 +54,11 @@
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
-# ===== Android Support/Compatibility Library =====
-
-LOCAL_PATH := $(call my-dir)
-
-# The source files for this library are _all_ generated, something we don't do
-# anywhere else, and the rules don't support. Aditionally, the depenencies on
-# these files don't really matter, because they are all generated as part of
-# building the docs. So for the dependency, we just use the
-# api-stubs-timestamp file, which is the $@ of the droiddoc rule.
-# We also need to depend on framework-res.apk, in order to pull the
-# resource files out of there for aapt.
-#
-# Normally the package rule runs aapt, which includes the resource,
-# but we're not running that in our package rule so just copy in the
-# resource files here.
-intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs_current_intermediates
-full_target := $(intermediates)/classes.jar
-src_dir := $(intermediates)/src
-classes_dir := $(intermediates)/classes
-framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
-
-$(full_target): PRIVATE_SRC_DIR := $(src_dir)
-$(full_target): PRIVATE_INTERMEDIATES_DIR := $(intermediates)
-$(full_target): PRIVATE_CLASS_INTERMEDIATES_DIR := $(classes_dir)
-$(full_target): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package)
-
-$(full_target): $(OUT_DOCS)/api-stubs-timestamp $(framework_res_package)
- @echo Compiling SDK Stubs: $@
- $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
- $(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)
- $(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \
- $(PRIVATE_INTERMEDIATES_DIR)/java-source-list
- $(hide) $(TARGET_JAVAC) -encoding ascii -bootclasspath "" \
- -g $(xlint_unchecked) \
- -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
- \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \
- || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )
- $(hide) if [ ! -f $(PRIVATE_FRAMEWORK_RES_PACKAGE) ]; then \
- echo Missing file $(PRIVATE_FRAMEWORK_RES_PACKAGE); \
- rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); \
- exit 1; \
- fi;
- $(hide) unzip -qo $(PRIVATE_FRAMEWORK_RES_PACKAGE) -d $(PRIVATE_CLASS_INTERMEDIATES_DIR)
- $(hide) (cd $(PRIVATE_CLASS_INTERMEDIATES_DIR) && rm -rf classes.dex META-INF)
- $(hide) mkdir -p $(dir $@)
- $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
- $(hide) jar -u0f $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc
+# ===== SDK jar file of stubs =====
+# A.k.a the "current" version of the public SDK (android.jar inside the SDK package).
+sdk_stub_name := android_stubs_current
+stub_timestamp := $(OUT_DOCS)/api-stubs-timestamp
+include $(LOCAL_PATH)/build_android_stubs.mk
.PHONY: android_stubs
android_stubs: $(full_target)
@@ -110,7 +70,7 @@
$(dir $(full_target))javalib.jar: $(full_target)
$(hide)$(ACP) $< $@
-
+# android.jar is what we put in the SDK package.
android_jar_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/android_jar_intermediates
android_jar_full_target := $(android_jar_intermediates)/android.jar
@@ -121,6 +81,8 @@
ALL_SDK_FILES += $(android_jar_full_target)
+# ====================================================
+
# The uiautomator stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar
@@ -174,3 +136,10 @@
$@
+# ============ System SDK ============
+sdk_stub_name := android_system_stubs_current
+stub_timestamp := $(OUT_DOCS)/system-api-stubs-timestamp
+include $(LOCAL_PATH)/build_android_stubs.mk
+
+.PHONY: android_system_stubs
+android_system_stubs: $(full_target)
diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk
new file mode 100644
index 0000000..a028900
--- /dev/null
+++ b/build/build_android_stubs.mk
@@ -0,0 +1,51 @@
+# Build an SDK jar file out of the generated stubs
+# Input variable:
+# sdk_stub_name: the name of the SDK stubs; the stub source code should have been generated to
+# $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates.
+# stub_timestamp: the timestamp file we use as dependency of the generated source.
+# Output variable:
+# full_target: the built classes.jar
+
+# The source files for this library are _all_ generated, something we don't do
+# anywhere else, and the rules don't support. Aditionally, the depenencies on
+# these files don't really matter, because they are all generated as part of
+# building the docs. So for the dependency, we just use the
+# api-stubs-timestamp file, which is the $@ of the droiddoc rule.
+# We also need to depend on framework-res.apk, in order to pull the
+# resource files out of there for aapt.
+#
+# Normally the package rule runs aapt, which includes the resource,
+# but we're not running that in our package rule so just copy in the
+# resource files here.
+intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates
+full_target := $(intermediates)/classes.jar
+src_dir := $(intermediates)/src
+classes_dir := $(intermediates)/classes
+framework_res_package := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
+
+$(full_target): PRIVATE_SRC_DIR := $(src_dir)
+$(full_target): PRIVATE_INTERMEDIATES_DIR := $(intermediates)
+$(full_target): PRIVATE_CLASS_INTERMEDIATES_DIR := $(classes_dir)
+$(full_target): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package)
+
+$(full_target): $(stub_timestamp) $(framework_res_package)
+ @echo Compiling SDK Stubs: $@
+ $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
+ $(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)
+ $(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \
+ $(PRIVATE_INTERMEDIATES_DIR)/java-source-list
+ $(hide) $(TARGET_JAVAC) -encoding ascii -bootclasspath "" \
+ -g $(xlint_unchecked) \
+ -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \
+ \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \
+ || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )
+ $(hide) if [ ! -f $(PRIVATE_FRAMEWORK_RES_PACKAGE) ]; then \
+ echo Missing file $(PRIVATE_FRAMEWORK_RES_PACKAGE); \
+ rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); \
+ exit 1; \
+ fi;
+ $(hide) unzip -qo $(PRIVATE_FRAMEWORK_RES_PACKAGE) -d $(PRIVATE_CLASS_INTERMEDIATES_DIR)
+ $(hide) (cd $(PRIVATE_CLASS_INTERMEDIATES_DIR) && rm -rf classes.dex META-INF)
+ $(hide) mkdir -p $(dir $@)
+ $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
+ $(hide) jar -u0f $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc
