summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2024-11-06 16:37:11 +0000
committer Winson Chung <winsonc@google.com> 2024-11-19 18:11:07 +0000
commit8f64d5cb1fb8e2aaa8c2ee0cb731b206b271e030 (patch)
tree82cb9137d058ff3c5d1e05fe22b8e1140bb52149
parentd0e4ee2fc64240bfeb8c4f1024ae3fe0e18fd976 (diff)
Add resources for shell/shared
Bug: 379778244 Flag: EXEMPT bugfix Test: m SystemUIGoogle Change-Id: Ia6b6b5b6f29b4910419a7a38637159be0621281f
-rw-r--r--libs/WindowManager/Shell/Android.bp45
-rw-r--r--libs/WindowManager/Shell/shared/Android.bp78
-rw-r--r--libs/WindowManager/Shell/shared/AndroidManifest.xml19
-rw-r--r--libs/WindowManager/Shell/shared/res/values/config.xml18
4 files changed, 115 insertions, 45 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index 42188dec4236..a354bf78bb39 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -156,51 +156,6 @@ java_library {
},
}
-filegroup {
- name: "wm_shell-shared-utils",
- srcs: [
- "shared/src/com/android/wm/shell/shared/TransitionUtil.java",
- ],
-}
-
-filegroup {
- name: "wm_shell-shared-aidls",
-
- srcs: [
- "shared/**/*.aidl",
- ],
-
- path: "shared/src",
-}
-
-java_library {
- name: "WindowManager-Shell-shared",
-
- srcs: [
- "shared/**/*.java",
- "shared/**/*.kt",
- ":wm_shell-shared-aidls",
- ],
- static_libs: [
- "androidx.core_core-animation",
- "androidx.dynamicanimation_dynamicanimation",
- "jsr330",
- ],
- kotlincflags: ["-Xjvm-default=all"],
-}
-
-java_library {
- name: "WindowManager-Shell-shared-desktopMode",
-
- srcs: [
- "shared/**/desktopmode/*.java",
- "shared/**/desktopmode/*.kt",
- ],
- static_libs: [
- "com.android.window.flags.window-aconfig-java",
- ],
-}
-
android_library {
name: "WindowManager-Shell",
srcs: [
diff --git a/libs/WindowManager/Shell/shared/Android.bp b/libs/WindowManager/Shell/shared/Android.bp
new file mode 100644
index 000000000000..5113d980fb7d
--- /dev/null
+++ b/libs/WindowManager/Shell/shared/Android.bp
@@ -0,0 +1,78 @@
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_base_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["frameworks_base_license"],
+ default_team: "trendy_team_multitasking_windowing",
+}
+
+filegroup {
+ name: "wm_shell-shared-utils",
+ srcs: [
+ "src/com/android/wm/shell/shared/TransitionUtil.java",
+ ],
+}
+
+filegroup {
+ name: "wm_shell-shared-aidls",
+
+ srcs: [
+ "**/*.aidl",
+ ],
+
+ path: "src",
+}
+
+// NOTE: This shared lib is built with various apps and should not
+// contain resources that can be overlaid, as they would need
+// to be overlaid in each app individually.
+android_library {
+ name: "WindowManager-Shell-shared",
+
+ resource_dirs: [
+ "res",
+ ],
+ srcs: [
+ "**/*.java",
+ "**/*.kt",
+ ":wm_shell-shared-aidls",
+ ],
+ static_libs: [
+ "androidx.core_core-animation",
+ "androidx.dynamicanimation_dynamicanimation",
+ "jsr330",
+ ],
+ kotlincflags: ["-Xjvm-default=all"],
+ use_resource_processor: true,
+}
+
+// NOTE: This shared lib is built with various apps and should not
+// contain resources that can be overlaid, as they would need
+// to be overlaid in each app individually.
+java_library {
+ name: "WindowManager-Shell-shared-desktopMode",
+
+ srcs: [
+ "**/desktopmode/*.java",
+ "**/desktopmode/*.kt",
+ ],
+ static_libs: [
+ "com.android.window.flags.window-aconfig-java",
+ ],
+}
diff --git a/libs/WindowManager/Shell/shared/AndroidManifest.xml b/libs/WindowManager/Shell/shared/AndroidManifest.xml
new file mode 100644
index 000000000000..5a4af5163fbe
--- /dev/null
+++ b/libs/WindowManager/Shell/shared/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2024 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.wm.shell.shared">
+</manifest>
diff --git a/libs/WindowManager/Shell/shared/res/values/config.xml b/libs/WindowManager/Shell/shared/res/values/config.xml
new file mode 100644
index 000000000000..a1d81cea093a
--- /dev/null
+++ b/libs/WindowManager/Shell/shared/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2024 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+</resources> \ No newline at end of file