+++ -34,9 +34,9 made today requires touching the same file, just copy the old # touch step and add it to the end of the list. frameworks/base/docs/knowntags.txt \ + -hidePackage \ -since $(SRC_API_DIR)/1.xml 1 \ -since $(SRC_API_DIR)/2.xml 2 \ -since $(SRC_API_DIR)/3.xml 3 \ -705,7 +707,7 $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) -# = the private api stubs = +# = the system api stubs = include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES) -717,11 +719,11 LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) -LOCAL_MODULE := private-api-stubs +LOCAL_MODULE := system-api-stubs LOCAL_DROIDDOC_OPTIONS:=\ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_private_stubs_current_intermediates/src \ + -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_system_stubs_current_intermediates/src \ -showAnnotation \ -nodocs diff -git a/CleanSpec.mk b/CleanSpec.mk framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -knowntags.
+# +# Conscrypt () is an implementation detail and should +# not be referenced in the documentation. +++ -94,8 +94,6 \ core/java/android/app/backup/IRestoreObserver.aidl \ core/java/android/app/backup/IRestoreSession.aidl \ - core/java/android/app/maintenance/IIdleCallback.aidl \ - core/java/android/app/maintenance/IIdleService.aidl \ core/java/android/bluetooth/IBluetooth.aidl \ core/java/android/bluetooth/IBluetoothA2dp.aidl \ core/java/android/bluetooth/IBluetoothA2dpSink.aidl \ -610,8 +608,12 := docs/html # The since flag (-since N.xml API_LEVEL) is used to add API Level information # to the reference documentation.
Merge "Fix persistent tasks and expand scope" diff -git a/Android.mk b/Android.mk
0 kommentar(er)
