diff options
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | AndroidManifest-common.xml | 4 | ||||
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | quickstep/AndroidManifest-launcher.xml | 6 | ||||
| -rw-r--r-- | quickstep/AndroidManifest.xml | 4 |
6 files changed, 22 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp index e132854e6..1b3035ed6 100644 --- a/Android.bp +++ b/Android.bp @@ -55,6 +55,5 @@ java_library { srcs: ["src_plugins/**/*.java"], - sdk_version: "current", - min_sdk_version: "28", + platform_apis: true, } diff --git a/Android.mk b/Android.mk index ab0f0b9ee..563ee6da5 100644 --- a/Android.mk +++ b/Android.mk @@ -60,8 +60,8 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 26 +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_CERTIFICATE := platform LOCAL_MODULE := Launcher3CommonDepsLib LOCAL_PRIVILEGED_MODULE := true LOCAL_MANIFEST_FILE := AndroidManifest-common.xml @@ -89,8 +89,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags # Proguard is disable for testing. Derivarive prjects to keep proguard enabled LOCAL_PROGUARD_ENABLED := disabled -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 26 +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_CERTIFICATE := platform LOCAL_PACKAGE_NAME := Trebuchet LOCAL_PRIVILEGED_MODULE := true LOCAL_SYSTEM_EXT_MODULE := true @@ -120,8 +120,8 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 26 +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_CERTIFICATE := platform LOCAL_PACKAGE_NAME := TrebuchetGo LOCAL_PRIVILEGED_MODULE := true LOCAL_SYSTEM_EXT_MODULE := true @@ -191,9 +191,9 @@ else LOCAL_MIN_SDK_VERSION := 26 endif LOCAL_PACKAGE_NAME := TrebuchetQuickStep -LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true LOCAL_SYSTEM_EXT_MODULE := true +LOCAL_CERTIFICATE := platform LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3 diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index a4365e72d..94fcfe7b6 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -19,7 +19,9 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.launcher3"> + package="com.android.launcher3" + coreApp="true" + android:sharedUserId="android.uid.system"> <!-- The manifest defines the common entries that should be present in any derivative of Launcher3. diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fcad766ae..958582a15 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,8 +20,10 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.android.launcher3"> - <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/> + package="com.android.launcher3" + coreApp="true" + android:sharedUserId="android.uid.system"> + <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="26"/> <!-- Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml. Refer comments around specific entries on how to extend individual components. diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml index 60afddb0a..6ff4c448f 100644 --- a/quickstep/AndroidManifest-launcher.xml +++ b/quickstep/AndroidManifest-launcher.xml @@ -19,8 +19,10 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.launcher3"> - <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/> + package="com.android.launcher3" + coreApp="true" + android:sharedUserId="android.uid.system"> + <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="25"/> <!-- Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml. Refer comments around specific entries on how to extend individual components. diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index dfacaafcb..742f7ed7b 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -20,7 +20,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.android.launcher3" > + package="com.android.launcher3" + coreApp="true" + android:sharedUserId="android.uid.system"> <permission android:name="${packageName}.permission.HOTSEAT_EDU" |