Move Launcher classes shared between tests and prod in a separate lib am: e8ee34ad8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21083963 Change-Id: I458dcd290168c185fc9a7c6974529c6cb08bf81d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
+5
-2
@@ -80,10 +80,10 @@ android_library {
|
|||||||
"androidx.preference_preference",
|
"androidx.preference_preference",
|
||||||
"SystemUISharedLib",
|
"SystemUISharedLib",
|
||||||
"SystemUIAnimationLib",
|
"SystemUIAnimationLib",
|
||||||
|
"launcher-testing-shared",
|
||||||
],
|
],
|
||||||
srcs: [
|
srcs: [
|
||||||
"tests/tapl/**/*.java",
|
"tests/tapl/**/*.java",
|
||||||
"src/com/android/launcher3/testing/shared/**/*.java",
|
|
||||||
],
|
],
|
||||||
resource_dirs: [ ],
|
resource_dirs: [ ],
|
||||||
manifest: "tests/tapl/AndroidManifest.xml",
|
manifest: "tests/tapl/AndroidManifest.xml",
|
||||||
@@ -169,7 +169,10 @@ android_library {
|
|||||||
android_library {
|
android_library {
|
||||||
name: "Launcher3CommonDepsLib",
|
name: "Launcher3CommonDepsLib",
|
||||||
srcs: ["src_build_config/**/*.java"],
|
srcs: ["src_build_config/**/*.java"],
|
||||||
static_libs: ["Launcher3ResLib"],
|
static_libs: [
|
||||||
|
"Launcher3ResLib",
|
||||||
|
"launcher-testing-shared",
|
||||||
|
],
|
||||||
sdk_version: "current",
|
sdk_version: "current",
|
||||||
min_sdk_version: min_launcher3_sdk_version,
|
min_sdk_version: min_launcher3_sdk_version,
|
||||||
manifest: "AndroidManifest-common.xml",
|
manifest: "AndroidManifest-common.xml",
|
||||||
|
|||||||
@@ -117,3 +117,15 @@ android_test {
|
|||||||
test_config: "Launcher3Tests.xml",
|
test_config: "Launcher3Tests.xml",
|
||||||
data: [":Launcher3"]
|
data: [":Launcher3"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Shared between tests and launcher
|
||||||
|
android_library {
|
||||||
|
name: "launcher-testing-shared",
|
||||||
|
srcs: [
|
||||||
|
"shared/com/android/launcher3/testing/shared/**/*.java"
|
||||||
|
],
|
||||||
|
resource_dirs: [ ],
|
||||||
|
manifest: "shared/AndroidManifest.xml",
|
||||||
|
sdk_version: "current",
|
||||||
|
min_sdk_version: min_launcher3_sdk_version,
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
/*
|
||||||
|
**
|
||||||
|
** Copyright 2023, 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 package="com.android.launcher3.testing.shared">
|
||||||
|
</manifest>
|
||||||
Reference in New Issue
Block a user