Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1f9813 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90 am: 4bc57805 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736

Change-Id: Ib8d66e1fb8845f3b47fd6e81091c0286ca6c8c9c
parents f15dfd0e 4bc57805

Android.bp

+0 −268
Original line number Diff line number Diff line
@@ -63,274 +63,6 @@ license { 
    ],

}



filegroup {

    name: "framework-core-sources",

    srcs: [

        "core/java/**/*.java",

        "core/java/**/*.aidl",

    ],

    path: "core/java",

}



// These are subset of framework-core-sources that are needed by the

// android.test.mock library. The implementation of android.test.mock references

// private members of various components to allow mocking of classes that cannot

// be mocked without access to those internal implementation details.

filegroup {

    name: "framework-core-sources-for-test-mock",

    srcs: [

        "core/java/android/accounts/AccountManagerCallback.java",

        "core/java/android/accounts/AccountManagerFuture.java",

        "core/java/android/accounts/AccountManager.java",

        "core/java/android/accounts/AccountsException.java",

        "core/java/android/accounts/AuthenticatorException.java",

        "core/java/android/accounts/OperationCanceledException.java",

        "core/java/android/annotation/AnimatorRes.java",

        "core/java/android/annotation/AnimRes.java",

        "core/java/android/annotation/AnyRes.java",

        "core/java/android/annotation/ArrayRes.java",

        "core/java/android/annotation/AttrRes.java",

        "core/java/android/annotation/BoolRes.java",

        "core/java/android/annotation/BroadcastBehavior.java",

        "core/java/android/annotation/CallbackExecutor.java",

        "core/java/android/annotation/CallSuper.java",

        "core/java/android/annotation/CheckResult.java",

        "core/java/android/annotation/ColorInt.java",

        "core/java/android/annotation/ColorRes.java",

        "core/java/android/annotation/DimenRes.java",

        "core/java/android/annotation/DrawableRes.java",

        "core/java/android/annotation/FontRes.java",

        "core/java/android/annotation/FractionRes.java",

        "core/java/android/annotation/IntDef.java",

        "core/java/android/annotation/IntegerRes.java",

        "core/java/android/annotation/IntRange.java",

        "core/java/android/annotation/LayoutRes.java",

        "core/java/android/annotation/NonNull.java",

        "core/java/android/annotation/Nullable.java",

        "core/java/android/annotation/PluralsRes.java",

        "core/java/android/annotation/RawRes.java",

        "core/java/android/annotation/RequiresPermission.java",

        "core/java/android/annotation/SdkConstant.java",

        "core/java/android/annotation/Size.java",

        "core/java/android/annotation/StringDef.java",

        "core/java/android/annotation/StringRes.java",

        "core/java/android/annotation/StyleableRes.java",

        "core/java/android/annotation/StyleRes.java",

        "core/java/android/annotation/SuppressLint.java",

        "core/java/android/annotation/SystemApi.java",

        "core/java/android/annotation/SystemService.java",

        "core/java/android/annotation/TestApi.java",

        "core/java/android/annotation/UserIdInt.java",

        "core/java/android/annotation/XmlRes.java",

        "core/java/android/app/Application.java",

        "core/java/android/app/IApplicationThread.aidl",

        "core/java/android/app/IServiceConnection.aidl",

        "core/java/android/app/PackageDeleteObserver.java",

        "core/java/android/content/ComponentCallbacks2.java",

        "core/java/android/content/ComponentCallbacks.java",

        "core/java/android/content/ContentInterface.java",

        "core/java/android/content/ContentProvider.java",

        "core/java/android/content/ContentProviderNative.java",

        "core/java/android/content/ContentResolver.java",

        "core/java/android/content/Context.java",

        "core/java/android/content/ContextWrapper.java",

        "core/java/android/content/DialogInterface.java",

        "core/java/android/content/IContentProvider.java",

        "core/java/android/content/Intent.java",

        "core/java/android/content/IntentSender.java",

        "core/java/android/content/OperationApplicationException.java",

        "core/java/android/content/pm/ActivityInfo.java",

        "core/java/android/content/pm/ApplicationInfo.java",

        "core/java/android/content/pm/InstantAppInfo.java",

        "core/java/android/content/pm/IPackageDataObserver.aidl",

        "core/java/android/content/pm/KeySet.java",

        "core/java/android/content/pm/PackageManager.java",

        "core/java/android/content/pm/VerifierDeviceIdentity.java",

        "core/java/android/content/res/Resources.java",

        "core/java/android/database/CrossProcessCursor.java",

        "core/java/android/database/CrossProcessCursorWrapper.java",

        "core/java/android/database/Cursor.java",

        "core/java/android/database/CursorWrapper.java",

        "core/java/android/os/Binder.java",

        "core/java/android/os/Bundle.java",

        "core/java/android/os/IBinder.java",

        "core/java/android/os/IInterface.java",

        "core/java/android/os/Parcelable.java",

        "core/java/android/os/ParcelFileDescriptor.java",

        "core/java/android/os/RemoteException.java",

        "core/java/android/os/storage/VolumeInfo.java",

        "core/java/android/util/AndroidException.java",

        "core/java/android/view/DisplayAdjustments.java",

        "core/java/android/view/ViewDebug.java",

        "core/java/com/android/internal/annotations/VisibleForTesting.java",

    ],

    path: "core/java",

    visibility: ["//frameworks/base/test-mock"],

}



filegroup {

    name: "framework-drm-sources",

    srcs: [

        "drm/java/**/*.java",

    ],

    path: "drm/java",

}



filegroup {

    name: "framework-graphics-nonupdatable-sources",

    srcs: [

        "graphics/java/**/*.java",

        "graphics/java/**/*.aidl",

    ],

    path: "graphics/java",

}



filegroup {

    name: "framework-identity-sources",

    srcs: [

        "identity/java/**/*.java",

    ],

    path: "identity/java",

}



filegroup {

    name: "framework-keystore-sources",

    srcs: [

        "keystore/java/**/*.java",

        "keystore/java/**/*.aidl",

    ],

    path: "keystore/java",

}



filegroup {

    name: "framework-location-sources",

    srcs: [

        "location/java/**/*.java",

        "location/java/**/*.aidl",

    ],

    path: "location/java",

}



filegroup {

    name: "framework-lowpan-sources",

    srcs: [

        "lowpan/java/**/*.java",

        "lowpan/java/**/*.aidl",

    ],

    path: "lowpan/java",

}



filegroup {

    name: "framework-media-sources",

    srcs: [

        "media/java/**/*.java",

        "media/java/**/*.aidl",

    ],

    exclude_srcs: [

        ":framework-media-tv-tunerresourcemanager-sources-aidl",

    ],

    path: "media/java",

}



filegroup {

    name: "framework-mca-effect-sources",

    srcs: [

        "media/mca/effect/java/**/*.java",

    ],

    path: "media/mca/effect/java",

}



filegroup {

    name: "framework-mca-filterfw-sources",

    srcs: [

        "media/mca/filterfw/java/**/*.java",

    ],

    path: "media/mca/filterfw/java",

}



filegroup {

    name: "framework-mca-filterpacks-sources",

    srcs: [

        "media/mca/filterpacks/java/**/*.java",

    ],

    path: "media/mca/filterpacks/java",

}



filegroup {

    name: "framework-mime-sources",

    srcs: [

        "mime/java/**/*.java",

    ],

    path: "mime/java",

}



filegroup {

    name: "framework-opengl-sources",

    srcs: [

        "opengl/java/**/*.java",

    ],

    path: "opengl/java",

}



filegroup {

    name: "framework-rs-sources",

    srcs: [

        "rs/java/**/*.java",

    ],

    path: "rs/java",

}



filegroup {

    name: "framework-sax-sources",

    srcs: [

        "sax/java/**/*.java",

    ],

    path: "sax/java",

}



filegroup {

    name: "framework-telecomm-sources",

    srcs: [

        "telecomm/java/**/*.java",

        "telecomm/java/**/*.aidl",

    ],

    path: "telecomm/java",

}



filegroup {

    name: "framework-telephony-sources",

    srcs: [

        "telephony/java/**/*.java",

        "telephony/java/**/*.aidl",

    ],

    path: "telephony/java",

}



genrule {

    name: "statslog-telephony-common-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +

        " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",

    out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],

}



filegroup {

    name: "framework-telephony-common-sources",

    srcs: [

        "telephony/common/**/*.java",

        ":statslog-telephony-common-java-gen",

    ],

}



filegroup {

    name: "framework-mms-sources",

    srcs: [

        "mms/java/**/*.java",

        "mms/java/**/*.aidl",

    ],

    path: "mms/java",

}



filegroup {

    name: "framework-non-updatable-sources",

    srcs: [

core/java/Android.bp

+104 −0
Original line number Diff line number Diff line
@@ -9,6 +9,15 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "framework-core-sources",

    srcs: [

        "**/*.java",

        "**/*.aidl",

    ],

    visibility: ["//frameworks/base"],

}



filegroup {

    name: "IKeyAttestationApplicationIdProvider.aidl",

    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
@@ -23,3 +32,98 @@ filegroup { 
    name: "ITracingServiceProxy.aidl",

    srcs: ["android/tracing/ITracingServiceProxy.aidl"],

}



// These are subset of framework-core-sources that are needed by the

// android.test.mock library. The implementation of android.test.mock references

// private members of various components to allow mocking of classes that cannot

// be mocked without access to those internal implementation details.

filegroup {

    name: "framework-core-sources-for-test-mock",

    srcs: [

        "android/accounts/AccountManagerCallback.java",

        "android/accounts/AccountManagerFuture.java",

        "android/accounts/AccountManager.java",

        "android/accounts/AccountsException.java",

        "android/accounts/AuthenticatorException.java",

        "android/accounts/OperationCanceledException.java",

        "android/annotation/AnimatorRes.java",

        "android/annotation/AnimRes.java",

        "android/annotation/AnyRes.java",

        "android/annotation/ArrayRes.java",

        "android/annotation/AttrRes.java",

        "android/annotation/BoolRes.java",

        "android/annotation/BroadcastBehavior.java",

        "android/annotation/CallbackExecutor.java",

        "android/annotation/CallSuper.java",

        "android/annotation/CheckResult.java",

        "android/annotation/ColorInt.java",

        "android/annotation/ColorRes.java",

        "android/annotation/DimenRes.java",

        "android/annotation/DrawableRes.java",

        "android/annotation/FontRes.java",

        "android/annotation/FractionRes.java",

        "android/annotation/IntDef.java",

        "android/annotation/IntegerRes.java",

        "android/annotation/IntRange.java",

        "android/annotation/LayoutRes.java",

        "android/annotation/NonNull.java",

        "android/annotation/Nullable.java",

        "android/annotation/PluralsRes.java",

        "android/annotation/RawRes.java",

        "android/annotation/RequiresPermission.java",

        "android/annotation/SdkConstant.java",

        "android/annotation/Size.java",

        "android/annotation/StringDef.java",

        "android/annotation/StringRes.java",

        "android/annotation/StyleableRes.java",

        "android/annotation/StyleRes.java",

        "android/annotation/SuppressLint.java",

        "android/annotation/SystemApi.java",

        "android/annotation/SystemService.java",

        "android/annotation/TestApi.java",

        "android/annotation/UserIdInt.java",

        "android/annotation/XmlRes.java",

        "android/app/Application.java",

        "android/app/IApplicationThread.aidl",

        "android/app/IServiceConnection.aidl",

        "android/app/PackageDeleteObserver.java",

        "android/content/ComponentCallbacks2.java",

        "android/content/ComponentCallbacks.java",

        "android/content/ContentInterface.java",

        "android/content/ContentProvider.java",

        "android/content/ContentProviderNative.java",

        "android/content/ContentResolver.java",

        "android/content/Context.java",

        "android/content/ContextWrapper.java",

        "android/content/DialogInterface.java",

        "android/content/IContentProvider.java",

        "android/content/Intent.java",

        "android/content/IntentSender.java",

        "android/content/OperationApplicationException.java",

        "android/content/pm/ActivityInfo.java",

        "android/content/pm/ApplicationInfo.java",

        "android/content/pm/InstantAppInfo.java",

        "android/content/pm/IPackageDataObserver.aidl",

        "android/content/pm/KeySet.java",

        "android/content/pm/PackageManager.java",

        "android/content/pm/VerifierDeviceIdentity.java",

        "android/content/res/Resources.java",

        "android/database/CrossProcessCursor.java",

        "android/database/CrossProcessCursorWrapper.java",

        "android/database/Cursor.java",

        "android/database/CursorWrapper.java",

        "android/os/Binder.java",

        "android/os/Bundle.java",

        "android/os/IBinder.java",

        "android/os/IInterface.java",

        "android/os/Parcelable.java",

        "android/os/ParcelFileDescriptor.java",

        "android/os/RemoteException.java",

        "android/os/storage/VolumeInfo.java",

        "android/util/AndroidException.java",

        "android/view/DisplayAdjustments.java",

        "android/view/ViewDebug.java",

        "com/android/internal/annotations/VisibleForTesting.java",

    ],

    visibility: ["//frameworks/base/test-mock"],

}

drm/java/Android.bp

0 → 100644
+5 −0
Original line number Diff line number Diff line 
filegroup {

    name: "framework-drm-sources",

    srcs: ["**/*.java"],

    visibility: ["//frameworks/base"],

}

graphics/java/Android.bp

0 → 100644
+8 −0
Original line number Diff line number Diff line 
filegroup {

    name: "framework-graphics-nonupdatable-sources",

    srcs: [

        "**/*.java",

        "**/*.aidl",

    ],

    visibility: ["//frameworks/base"],

}

identity/java/Android.bp

0 → 100644
+5 −0
Original line number Diff line number Diff line 
filegroup {

    name: "framework-identity-sources",

    srcs: ["**/*.java"],

    visibility: ["//frameworks/base"],

}