diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 101 |
1 files changed, 33 insertions, 68 deletions
@@ -94,10 +94,10 @@ LOCAL_SRC_FILES += \ core/java/android/app/backup/IFullBackupRestoreObserver.aidl \ 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 \ + core/java/android/bluetooth/IBluetoothAvrcpController.aidl \ core/java/android/bluetooth/IBluetoothCallback.aidl \ core/java/android/bluetooth/IBluetoothHeadset.aidl \ core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \ @@ -110,6 +110,7 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothPbap.aidl \ core/java/android/bluetooth/IBluetoothMap.aidl \ core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ + core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ core/java/android/bluetooth/IBluetoothGatt.aidl \ core/java/android/bluetooth/IBluetoothGattCallback.aidl \ core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ @@ -118,6 +119,7 @@ LOCAL_SRC_FILES += \ core/java/android/content/IIntentReceiver.aidl \ core/java/android/content/IIntentSender.aidl \ core/java/android/content/IOnPrimaryClipChangedListener.aidl \ + core/java/android/content/IRestrictionsManager.aidl \ core/java/android/content/ISyncAdapter.aidl \ core/java/android/content/ISyncContext.aidl \ core/java/android/content/ISyncServiceAdapter.aidl \ @@ -148,7 +150,9 @@ LOCAL_SRC_FILES += \ core/java/android/hardware/display/IDisplayManagerCallback.aidl \ core/java/android/hardware/hdmi/IHdmiControlCallback.aidl \ core/java/android/hardware/hdmi/IHdmiControlService.aidl \ + core/java/android/hardware/hdmi/IHdmiDeviceEventListener.aidl \ core/java/android/hardware/hdmi/IHdmiHotplugEventListener.aidl \ + core/java/android/hardware/hdmi/IHdmiSystemAudioModeChangeListener.aidl \ core/java/android/hardware/input/IInputManager.aidl \ core/java/android/hardware/input/IInputDevicesChangedListener.aidl \ core/java/android/hardware/location/IFusedLocationHardware.aidl \ @@ -172,6 +176,7 @@ LOCAL_SRC_FILES += \ core/java/android/nfc/INfcAdapterExtras.aidl \ core/java/android/nfc/INfcTag.aidl \ core/java/android/nfc/INfcCardEmulation.aidl \ + core/java/android/nfc/INfcLockscreenDispatch.aidl \ core/java/android/os/IBatteryPropertiesListener.aidl \ core/java/android/os/IBatteryPropertiesRegistrar.aidl \ core/java/android/os/ICancellationSignal.aidl \ @@ -325,8 +330,6 @@ LOCAL_SRC_FILES += \ telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl \ telecomm/java/com/android/internal/telecomm/ICallServiceLookupResponse.aidl \ telecomm/java/com/android/internal/telecomm/ICallServiceProvider.aidl \ - telecomm/java/com/android/internal/telecomm/ICallServiceSelector.aidl \ - telecomm/java/com/android/internal/telecomm/ICallServiceSelectorAdapter.aidl \ telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl \ telecomm/java/com/android/internal/telecomm/IInCallService.aidl \ telecomm/java/com/android/internal/telecomm/ITelecommService.aidl \ @@ -340,6 +343,8 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/ISms.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ + telephony/java/com/android/internal/telephony/ISub.aidl \ + telephony/java/com/android/internal/telephony/IMms.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \ wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ @@ -357,7 +362,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/com/android/internal/R.java LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp +LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext LOCAL_MODULE := framework-base @@ -381,54 +386,14 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_STATIC_JAVA_LIBRARIES := framework-base LOCAL_DX_FLAGS := --core-library -# Packages to include, use \* wildcard to include descendants. +# List of packages to include along with their descendants. LOCAL_JAR_PACKAGES := \ - android \ - android.accessibilityservice\* \ - android.accounts\* \ - android.alsa\* \ - android.animation\* \ - android.annotation\* \ - android.app\* \ - android.appwidget\* \ - android.bluetooth\* \ - android.content\* \ - android.content\* \ - android.database\* \ - android.ddm\* \ - android.drm\* \ - android.emoji\* \ - android.filterfw\* \ - android.filterpacks\* \ - android.gesture\* \ - android.graphics\* \ - android.inputmethodservice\* \ - android.location\* \ - android.media\* \ - android.mtp\* \ - android.net\* \ - android.nfc\* \ - android.opengl\* \ - android.os\* \ - android.preference\* \ - android.print\* \ - android.printservice\* \ - android.provider\* \ - android.renderscript\* \ - android.sax\* \ - android.security\* \ - android.service\* \ - android.speech\* \ - android.system\* \ - android.telecomm\* \ - android.telephony\* \ - android.test\* \ - android.text\* \ - android.transition\* \ - android.util\* \ - android.view\* \ - android.webkit\* \ - android.widget\* + android + +# List of packages to exclude along with their descendants. +# Overrides inclusion. +LOCAL_JAR_EXCLUDE_PACKAGES := \ + android.hardware # List of classes and interfaces which should be loaded by the Zygote. LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes @@ -446,16 +411,11 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_STATIC_JAVA_LIBRARIES := framework-base LOCAL_DX_FLAGS := --core-library -# Packages to include, use \* wildcard to include descendants. -# 'android' is required to be able to include 'android.hardware', -# however, it causes classes in 'android' to be part of framework -# and framework2. -# TODO: Finer grained matching. +# List of packages to include along with their descendants. LOCAL_JAR_PACKAGES := \ - android \ - android.hardware\* \ - com\* \ - javax\* + android.hardware \ + com \ + javax include $(BUILD_JAVA_LIBRARY) framework2_module := $(LOCAL_INSTALLED_MODULE) @@ -630,9 +590,9 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ $(framework_res_source_path)/com/android/internal/R.java framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ - bouncycastle \ + core-libart \ conscrypt \ - core \ + bouncycastle \ okhttp \ ext \ framework \ @@ -649,8 +609,12 @@ framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html # The since flag (-since N.xml API_LEVEL) is used to add API Level information # to the reference documentation. Must be in order of oldest to newest. +# +# Conscrypt (com.android.org.conscrypt) is an implementation detail and should +# not be referenced in the documentation. framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -knowntags ./frameworks/base/docs/knowntags.txt \ + -hidePackage com.android.org.conscrypt \ -since $(SRC_API_DIR)/1.xml 1 \ -since $(SRC_API_DIR)/2.xml 2 \ -since $(SRC_API_DIR)/3.xml 3 \ @@ -670,7 +634,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/17.txt 17 \ -since $(SRC_API_DIR)/18.txt 18 \ -since $(SRC_API_DIR)/19.txt 19 \ - -werror -hide 113 \ + -werror -hide 111 -hide 113 \ -overview $(LOCAL_PATH)/core/java/overview.html framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ @@ -744,7 +708,7 @@ $(full_target): $(framework_built) $(gen) $(INTERNAL_PLATFORM_API_FILE): $(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) @@ -756,11 +720,11 @@ LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR) LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) 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 android.annotation.SystemApi \ -nodocs @@ -858,6 +822,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -toroot / \ -hdf android.whichdoc online \ + -briefdocs \ $(sample_groups) \ -hdf android.hasSamples true \ -samplesdir $(samples_dir) @@ -939,7 +904,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(ext_src_files) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := core-libart LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext |