Merge "Implement family fallback."

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 7d1b7ef..1a36d18 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -438,10 +438,6 @@ LOCAL_SRC_FILES += \
        location/java/android/location/INetInitiatedListener.aidl \
        location/java/com/android/internal/location/ILocationProvider.aidl \
        media/java/android/media/IAudioService.aidl \
-       ../av/drm/libmediadrm/aidl/android/media/ICas.aidl \
-       ../av/drm/libmediadrm/aidl/android/media/ICasListener.aidl \
-       ../av/drm/libmediadrm/aidl/android/media/IDescrambler.aidl \
-       ../av/drm/libmediadrm/aidl/android/media/IMediaCasService.aidl \
        media/java/android/media/IAudioFocusDispatcher.aidl \
        media/java/android/media/IAudioRoutesObserver.aidl \
        media/java/android/media/IMediaHTTPConnection.aidl \
@@ -614,6 +610,8 @@ LOCAL_STATIC_JAVA_LIBRARIES :=                          \
     android.hardware.vibrator-V1.1-java-constants        \
     android.hardware.wifi-V1.0-java-constants            \
 
+include hardware/interfaces/cas/1.0/CasHal.mk
+
 # Loaded with System.loadLibrary by android.view.textclassifier
 LOCAL_REQUIRED_MODULES += libtextclassifier
 
@@ -714,6 +712,7 @@ aidl_files := \
        frameworks/base/core/java/android/print/PrintJobId.aidl \
        frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \
        frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \
+       frameworks/base/core/java/android/hardware/radio/RadioMetadata.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
@@ -729,6 +728,7 @@ aidl_files := \
        frameworks/base/core/java/android/os/DropBoxManager.aidl \
        frameworks/base/core/java/android/os/Bundle.aidl \
        frameworks/base/core/java/android/os/Debug.aidl \
+       frameworks/base/core/java/android/os/SharedMemory.aidl \
        frameworks/base/core/java/android/os/StrictMode.aidl \
        frameworks/base/core/java/android/accessibilityservice/AccessibilityServiceInfo.aidl \
        frameworks/base/core/java/android/net/Network.aidl \
@@ -873,7 +873,6 @@ packages_to_document := \
 # The result will be relative to frameworks/base.
 fwbase_dirs_to_document := \
        legacy-test/src \
-       test-runner/src \
        $(patsubst $(LOCAL_PATH)/%,%, \
          $(wildcard \
            $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \
@@ -891,6 +890,12 @@ non_base_dirs := \
        ../opt/net/voip/src/java/android/net/rtp \
        ../opt/net/voip/src/java/android/net/sip
 
+framework_base_android_test_mock_src_files := \
+       $(call all-java-files-under, test-runner/src/android/test/mock)
+
+framework_base_android_test_runner_excluding_mock_src_files := \
+       $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src))
+
 # These are relative to frameworks/base
 dirs_to_check_apis := \
   $(fwbase_dirs_to_document) \
@@ -910,8 +915,8 @@ endef
 # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
 dirs_to_document := \
        $(dirs_to_check_apis) \
-  $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) \
-  $(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS)) \
+       test-runner/src \
+       $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS))
 
 patterns_to_not_document := \
        $(call find-no-docs-pattern, $(dirs_to_document))
@@ -933,7 +938,9 @@ framework_docs_LOCAL_SRC_FILES := \
 
 # These are relative to frameworks/base
 framework_docs_LOCAL_API_CHECK_SRC_FILES := \
-       $(call find-other-java-files, $(dirs_to_check_apis)) \
+       $(framework_base_android_test_mock_src_files) \
+       $(framework_base_android_test_runner_excluding_mock_src_files) \
+       $(call all-java-files-under, $(dirs_to_check_apis)) \
        $(common_src_files)
 
 # This is used by ide.mk as the list of source files that are
@@ -957,8 +964,11 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
        ext \
        icu4j \
        framework \
-       voip-common
+       voip-common \
+       android.test.mock \
 
+# Platform docs can refer to Support Library APIs, but we don't actually build
+# them as part of the docs target, so we need to include them on the classpath.
 framework_docs_LOCAL_JAVA_LIBRARIES := \
        $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) \
        $(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES)
@@ -1005,16 +1015,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -werror -hide 111 -hide 113 -hide 121 \
     -overview $(LOCAL_PATH)/core/java/overview.html \
 
-# Allow the support library to add its own droiddoc options.
-include $(LOCAL_PATH)/../support/droiddoc.mk
-
 framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \
        $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)
 
 framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \
-       $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) \
-       $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)) \
-       $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib)-res,,COMMON))
+       $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
 
 framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
     frameworks/base/docs/knowntags.txt \
@@ -1057,6 +1062,11 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
                -resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \
                -resourcesoutdir reference/android/images/
 
+# Federate Support Library references against local API file.
+framework_docs_LOCAL_DROIDDOC_OPTIONS += \
+               -federate SupportLib https://developer.android.com \
+               -federationapi SupportLib prebuilts/sdk/current/support-api.txt
+
 # ====  the api stubs and current.xml ===========================
 include $(CLEAR_VARS)