Fix privilege escalation for preferred activities

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

diff --git a/Android.mk b/Android.mk
index 7cbc339..45e9c76 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -31,6 +31,10 @@ framework_res_source_path := APPS/framework-res_intermediates/src
 # So we first build the framework as a monolithic static library then split it
 # up into smaller pieces.
 # ============================================================
+
+# embedded builds use nothing in frameworks/base
+ifneq ($(ANDROID_BUILD_EMBEDDED),true)
+
 include $(CLEAR_VARS)
 
 # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
@@ -85,6 +89,8 @@ 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/IBluetoothCallback.aidl \
@@ -107,9 +113,9 @@ 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/IAnonymousSyncAdapter.aidl \
        core/java/android/content/ISyncAdapter.aidl \
        core/java/android/content/ISyncContext.aidl \
+       core/java/android/content/ISyncServiceAdapter.aidl \
        core/java/android/content/ISyncStatusObserver.aidl \
        core/java/android/content/pm/IPackageDataObserver.aidl \
        core/java/android/content/pm/IPackageDeleteObserver.aidl \
@@ -130,6 +136,8 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/ISerialManager.aidl \
        core/java/android/hardware/display/IDisplayManager.aidl \
        core/java/android/hardware/display/IDisplayManagerCallback.aidl \
+       core/java/android/hardware/hdmi/IHdmiCecListener.aidl \
+       core/java/android/hardware/hdmi/IHdmiCecService.aidl \
        core/java/android/hardware/input/IInputManager.aidl \
        core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
        core/java/android/hardware/location/IFusedLocationHardware.aidl \
@@ -150,11 +158,13 @@ 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/INfcUnlockSettings.aidl \
        core/java/android/os/IBatteryPropertiesListener.aidl \
        core/java/android/os/IBatteryPropertiesRegistrar.aidl \
        core/java/android/os/ICancellationSignal.aidl \
        core/java/android/os/IHardwareService.aidl \
        core/java/android/os/IMessenger.aidl \
+       core/java/android/os/INetworkActivityListener.aidl \
        core/java/android/os/INetworkManagementService.aidl \
        core/java/android/os/IPermissionController.aidl \
        core/java/android/os/IPowerManager.aidl \
@@ -188,7 +198,6 @@ LOCAL_SRC_FILES += \
        core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
        core/java/android/view/IApplicationToken.aidl \
        core/java/android/view/IAssetAtlas.aidl \
-       core/java/android/view/IMagnificationCallbacks.aidl \
        core/java/android/view/IInputFilter.aidl \
        core/java/android/view/IInputFilterHost.aidl \
        core/java/android/view/IOnKeyguardExitResult.aidl \
@@ -254,6 +263,8 @@ LOCAL_SRC_FILES += \
        media/java/android/media/IAudioService.aidl \
        media/java/android/media/IAudioFocusDispatcher.aidl \
        media/java/android/media/IAudioRoutesObserver.aidl \
+       media/java/android/media/IMediaHTTPConnection.aidl \
+       media/java/android/media/IMediaHTTPService.aidl \
        media/java/android/media/IMediaRouterClient.aidl \
        media/java/android/media/IMediaRouterService.aidl \
        media/java/android/media/IMediaScannerListener.aidl \
@@ -264,6 +275,11 @@ LOCAL_SRC_FILES += \
        media/java/android/media/IRemoteDisplayProvider.aidl \
        media/java/android/media/IRemoteVolumeObserver.aidl \
        media/java/android/media/IRingtonePlayer.aidl \
+       media/java/android/media/session/IMediaController.aidl \
+       media/java/android/media/session/IMediaControllerCallback.aidl \
+       media/java/android/media/session/IMediaSession.aidl \
+       media/java/android/media/session/IMediaSessionCallback.aidl \
+       media/java/android/media/session/IMediaSessionManager.aidl \
        telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \
        telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
@@ -289,7 +305,7 @@ LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp
 
 LOCAL_MODULE := framework-base
 
-LOCAL_JAR_EXCLUDE_FILES := none
+LOCAL_RMTYPEDEFS := true
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
@@ -374,6 +390,17 @@ aidl_files := \
        frameworks/base/core/java/android/os/DropBoxManager.aidl \
        frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
        frameworks/base/core/java/android/os/ParcelUuid.aidl \
+       frameworks/base/core/java/android/print/PrinterInfo.aidl \
+       frameworks/base/core/java/android/print/PageRange.aidl \
+       frameworks/base/core/java/android/print/PrintAttributes.aidl \
+       frameworks/base/core/java/android/print/PrinterCapabilitiesInfo.aidl \
+       frameworks/base/core/java/android/print/PrinterId.aidl \
+       frameworks/base/core/java/android/print/PrintJobId.aidl \
+       frameworks/base/core/java/android/print/PrintJobInfo.aidl \
+       frameworks/base/core/java/android/view/accessibility/AccessibilityEvent.aidl \
+       frameworks/base/core/java/android/view/accessibility/AccessibilityNodeInfo.aidl \
+       frameworks/base/core/java/android/view/accessibility/AccessibilityRecord.aidl \
+       frameworks/base/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl \
        frameworks/base/core/java/android/view/KeyEvent.aidl \
        frameworks/base/core/java/android/view/MotionEvent.aidl \
        frameworks/base/core/java/android/view/Surface.aidl \
@@ -591,6 +618,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
                $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
                -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_stubs_current_intermediates/src \
                -api $(INTERNAL_PLATFORM_API_FILE) \
+               -removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \
                -nodocs
 
 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
@@ -790,3 +818,5 @@ include $(BUILD_JAVA_LIBRARY)
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call first-makefiles-under,$(LOCAL_PATH))
 endif
+
+endif # ANDROID_BUILD_EMBEDDED