Merge "Convert sysui to bp"
This commit is contained in:
committed by
Android (Google) Code Review
commit
d2d33da1f6
76
packages/CarSystemUI/Android.bp
Normal file
76
packages/CarSystemUI/Android.bp
Normal file
@@ -0,0 +1,76 @@
|
||||
//
|
||||
// Copyright (C) 2018 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.
|
||||
//
|
||||
android_app {
|
||||
name: "CarSystemUI",
|
||||
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"SystemUI-core",
|
||||
"SystemUIPluginLib",
|
||||
"SystemUISharedLib",
|
||||
"SettingsLib",
|
||||
"androidx.car_car",
|
||||
"androidx.legacy_legacy-support-v4",
|
||||
"androidx.recyclerview_recyclerview",
|
||||
"androidx.preference_preference",
|
||||
"androidx.appcompat_appcompat",
|
||||
"androidx.mediarouter_mediarouter",
|
||||
"androidx.palette_palette",
|
||||
"androidx.legacy_legacy-preference-v14",
|
||||
"androidx.leanback_leanback",
|
||||
"androidx.slice_slice-core",
|
||||
"androidx.slice_slice-view",
|
||||
"androidx.slice_slice-builders",
|
||||
"androidx.arch.core_core-runtime",
|
||||
"androidx.lifecycle_lifecycle-extensions",
|
||||
"SystemUI-tags",
|
||||
"SystemUI-proto",
|
||||
],
|
||||
|
||||
libs: [
|
||||
"telephony-common",
|
||||
"android.car",
|
||||
],
|
||||
|
||||
manifest: "AndroidManifest.xml",
|
||||
|
||||
owner: "google",
|
||||
platform_apis: true,
|
||||
certificate: "platform",
|
||||
privileged: true,
|
||||
|
||||
optimize: {
|
||||
proguard_flags_files: [
|
||||
"proguard.flags",
|
||||
],
|
||||
},
|
||||
resource_dirs: [
|
||||
"res",
|
||||
],
|
||||
|
||||
|
||||
dxflags: ["--multi-dex"],
|
||||
|
||||
aaptflags: [
|
||||
"--extra-packages",
|
||||
"com.android.keyguard",
|
||||
],
|
||||
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
# LOCAL_PATH is not the current directory of this file.
|
||||
# If you need the local path, use CAR_SYSUI_PATH.
|
||||
# This tweak ensures that the resource overlay that is device-specific still works
|
||||
# which requires that LOCAL_PATH match the original path (which must be frameworks/base/packages/SystemUI).
|
||||
#
|
||||
# For clarity, we also define SYSTEM_UI_AOSP_PATH to frameworks/base/packages/SystemUI and refer to that
|
||||
SYSTEM_UI_AOSP_PATH := frameworks/base/packages/SystemUI
|
||||
SYSTEM_UI_CAR_PATH := frameworks/base/packages/CarSystemUI
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
# The same as SYSTEM_UI_AOSP_PATH but based on the value of LOCAL_PATH which is
|
||||
# frameworks/base/packages/CarSystemUI.
|
||||
RELATIVE_SYSTEM_UI_AOSP_PATH := ../../../../$(SYSTEM_UI_AOSP_PATH)
|
||||
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(call all-java-files-under, src) \
|
||||
$(call all-Iaidl-files-under, src) \
|
||||
$(call all-java-files-under, $(RELATIVE_SYSTEM_UI_AOSP_PATH)/src) \
|
||||
$(call all-Iaidl-files-under, $(RELATIVE_SYSTEM_UI_AOSP_PATH)/src)
|
||||
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := \
|
||||
SystemUIPluginLib \
|
||||
SystemUISharedLib \
|
||||
androidx.car_car \
|
||||
androidx.legacy_legacy-support-v4 \
|
||||
androidx.recyclerview_recyclerview \
|
||||
androidx.preference_preference \
|
||||
androidx.appcompat_appcompat \
|
||||
androidx.mediarouter_mediarouter \
|
||||
androidx.palette_palette \
|
||||
androidx.legacy_legacy-preference-v14 \
|
||||
androidx.leanback_leanback \
|
||||
androidx.slice_slice-core \
|
||||
androidx.slice_slice-view \
|
||||
androidx.slice_slice-builders \
|
||||
androidx.arch.core_core-runtime \
|
||||
androidx.lifecycle_lifecycle-extensions \
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
SystemUI-tags \
|
||||
SystemUI-proto
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := telephony-common \
|
||||
android.car
|
||||
|
||||
LOCAL_FULL_LIBS_MANIFEST_FILES := $(SYSTEM_UI_AOSP_PATH)/AndroidManifest.xml
|
||||
LOCAL_MANIFEST_FILE := AndroidManifest.xml
|
||||
|
||||
LOCAL_MODULE_OWNER := google
|
||||
LOCAL_PACKAGE_NAME := CarSystemUI
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
|
||||
LOCAL_PROGUARD_FLAG_FILES := $(RELATIVE_SYSTEM_UI_AOSP_PATH)/proguard.flags \
|
||||
proguard.flags
|
||||
|
||||
LOCAL_RESOURCE_DIR := \
|
||||
$(LOCAL_PATH)/res \
|
||||
$(SYSTEM_UI_AOSP_PATH)/res-keyguard \
|
||||
$(SYSTEM_UI_AOSP_PATH)/res
|
||||
|
||||
ifneq ($(INCREMENTAL_BUILDS),)
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
LOCAL_JACK_ENABLED := incremental
|
||||
endif
|
||||
|
||||
LOCAL_DX_FLAGS := --multi-dex
|
||||
LOCAL_JACK_FLAGS := --multi-dex native
|
||||
|
||||
include frameworks/base/packages/SettingsLib/common.mk
|
||||
|
||||
LOCAL_OVERRIDES_PACKAGES := SystemUI
|
||||
|
||||
LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
include $(call all-makefiles-under, $(SYSTEM_UI_CAR_PATH))
|
||||
@@ -1 +1,3 @@
|
||||
-keep class com.android.systemui.CarSystemUIFactory
|
||||
|
||||
-include ../SystemUI/proguard.flags
|
||||
|
||||
25
packages/SettingsLib/Android.bp
Normal file
25
packages/SettingsLib/Android.bp
Normal file
@@ -0,0 +1,25 @@
|
||||
android_library {
|
||||
|
||||
name: "SettingsLib",
|
||||
|
||||
libs: [
|
||||
"androidx.annotation_annotation",
|
||||
"androidx.legacy_legacy-support-v4",
|
||||
"androidx.recyclerview_recyclerview",
|
||||
"androidx.preference_preference",
|
||||
"androidx.appcompat_appcompat",
|
||||
"androidx.lifecycle_lifecycle-runtime",
|
||||
],
|
||||
|
||||
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
|
||||
// LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common
|
||||
|
||||
resource_dirs: ["res"],
|
||||
|
||||
srcs: ["src/**/*.java"],
|
||||
|
||||
min_sdk_version: "21",
|
||||
|
||||
}
|
||||
|
||||
// For the test package.
|
||||
@@ -1,34 +0,0 @@
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_AAPT2_ONLY := true
|
||||
|
||||
LOCAL_MODULE := SettingsLib
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := \
|
||||
androidx.annotation_annotation
|
||||
|
||||
LOCAL_SHARED_ANDROID_LIBRARIES := \
|
||||
androidx.legacy_legacy-support-v4 \
|
||||
androidx.recyclerview_recyclerview \
|
||||
androidx.preference_preference \
|
||||
androidx.appcompat_appcompat \
|
||||
androidx.lifecycle_lifecycle-runtime
|
||||
|
||||
LOCAL_SHARED_JAVA_LIBRARIES := \
|
||||
androidx.lifecycle_lifecycle-common
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
|
||||
LOCAL_JAR_EXCLUDE_FILES := none
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
LOCAL_MIN_SDK_VERSION := 21
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
# For the test package.
|
||||
include $(call all-makefiles-under, $(LOCAL_PATH))
|
||||
101
packages/SystemUI/Android.bp
Normal file
101
packages/SystemUI/Android.bp
Normal file
@@ -0,0 +1,101 @@
|
||||
//
|
||||
// Copyright (C) 2018 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.
|
||||
//
|
||||
|
||||
java_library {
|
||||
name: "SystemUI-proto",
|
||||
|
||||
srcs: ["src/**/*.proto"],
|
||||
|
||||
proto: {
|
||||
type: "nano",
|
||||
},
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "SystemUI-tags",
|
||||
srcs: ["src/com/android/systemui/EventLogTags.logtags"],
|
||||
}
|
||||
|
||||
android_library {
|
||||
name: "SystemUI-core",
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
],
|
||||
resource_dirs: [
|
||||
"res-keyguard",
|
||||
"res",
|
||||
],
|
||||
static_libs: [
|
||||
"SystemUIPluginLib",
|
||||
"SystemUISharedLib",
|
||||
"SettingsLib",
|
||||
"androidx.car_car",
|
||||
"androidx.legacy_legacy-support-v4",
|
||||
"androidx.recyclerview_recyclerview",
|
||||
"androidx.preference_preference",
|
||||
"androidx.appcompat_appcompat",
|
||||
"androidx.mediarouter_mediarouter",
|
||||
"androidx.palette_palette",
|
||||
"androidx.legacy_legacy-preference-v14",
|
||||
"androidx.leanback_leanback",
|
||||
"androidx.slice_slice-core",
|
||||
"androidx.slice_slice-view",
|
||||
"androidx.slice_slice-builders",
|
||||
"androidx.arch.core_core-runtime",
|
||||
"androidx.lifecycle_lifecycle-extensions",
|
||||
"SystemUI-tags",
|
||||
"SystemUI-proto",
|
||||
],
|
||||
manifest: "AndroidManifest.xml",
|
||||
|
||||
libs: [
|
||||
"telephony-common",
|
||||
"android.car",
|
||||
],
|
||||
|
||||
aaptflags: [
|
||||
"--extra-packages",
|
||||
"com.android.keyguard",
|
||||
],
|
||||
}
|
||||
|
||||
android_app {
|
||||
name: "SystemUI",
|
||||
static_libs: [
|
||||
"SystemUI-core",
|
||||
],
|
||||
|
||||
platform_apis: true,
|
||||
certificate: "platform",
|
||||
privileged: true,
|
||||
|
||||
optimize: {
|
||||
proguard_flags_files: ["proguard.flags"],
|
||||
},
|
||||
|
||||
libs: [
|
||||
"telephony-common",
|
||||
"android.car",
|
||||
],
|
||||
|
||||
dxflags: ["--multi-dex"],
|
||||
aaptflags: [
|
||||
"--extra-packages",
|
||||
"com.android.keyguard",
|
||||
],
|
||||
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := SystemUI-proto
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-proto-files-under,src)
|
||||
|
||||
LOCAL_PROTOC_OPTIMIZE_TYPE := nano
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := SystemUI-tags
|
||||
|
||||
LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
# ------------------
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
RELATIVE_FINGERPRINT_PATH := ../../core/java/android/hardware/fingerprint
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(call all-java-files-under, src) \
|
||||
$(call all-Iaidl-files-under, src) \
|
||||
$(call all-Iaidl-files-under, $(RELATIVE_FINGERPRINT_PATH))
|
||||
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := \
|
||||
SystemUIPluginLib \
|
||||
SystemUISharedLib \
|
||||
androidx.car_car \
|
||||
androidx.legacy_legacy-support-v4 \
|
||||
androidx.recyclerview_recyclerview \
|
||||
androidx.preference_preference \
|
||||
androidx.appcompat_appcompat \
|
||||
androidx.mediarouter_mediarouter \
|
||||
androidx.palette_palette \
|
||||
androidx.legacy_legacy-preference-v14 \
|
||||
androidx.leanback_leanback \
|
||||
androidx.slice_slice-core \
|
||||
androidx.slice_slice-view \
|
||||
androidx.slice_slice-builders \
|
||||
androidx.arch.core_core-runtime \
|
||||
androidx.lifecycle_lifecycle-extensions \
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
SystemUI-tags \
|
||||
SystemUI-proto
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := telephony-common \
|
||||
android.car
|
||||
|
||||
LOCAL_PACKAGE_NAME := SystemUI
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
|
||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res-keyguard $(LOCAL_PATH)/res
|
||||
|
||||
ifneq ($(INCREMENTAL_BUILDS),)
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
LOCAL_JACK_ENABLED := incremental
|
||||
LOCAL_DX_FLAGS := --multi-dex
|
||||
LOCAL_JACK_FLAGS := --multi-dex native
|
||||
endif
|
||||
|
||||
include frameworks/base/packages/SettingsLib/common.mk
|
||||
|
||||
LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
37
packages/SystemUI/plugin/Android.bp
Normal file
37
packages/SystemUI/plugin/Android.bp
Normal file
@@ -0,0 +1,37 @@
|
||||
// Copyright (C) 2016 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.
|
||||
|
||||
java_library {
|
||||
|
||||
name: "SystemUIPluginLib",
|
||||
|
||||
srcs: ["src/**/*.java"],
|
||||
|
||||
|
||||
}
|
||||
|
||||
android_app {
|
||||
|
||||
// Dummy to generate .toc files.
|
||||
name: "PluginDummyLib",
|
||||
platform_apis: true,
|
||||
srcs: ["src/**/*.java"],
|
||||
|
||||
libs: ["SystemUIPluginLib"],
|
||||
|
||||
optimize: {
|
||||
enabled: false,
|
||||
},
|
||||
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
# Copyright (C) 2016 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.
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_MODULE := SystemUIPluginLib
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
LOCAL_JAR_EXCLUDE_FILES := none
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
# Dummy to generate .toc files.
|
||||
LOCAL_PACKAGE_NAME := PluginDummyLib
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := SystemUIPluginLib
|
||||
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
14
packages/SystemUI/plugin/ExamplePlugin/Android.bp
Normal file
14
packages/SystemUI/plugin/ExamplePlugin/Android.bp
Normal file
@@ -0,0 +1,14 @@
|
||||
android_app {
|
||||
|
||||
name: "ExamplePlugin",
|
||||
|
||||
libs: ["SystemUIPluginLib"],
|
||||
|
||||
certificate: "platform",
|
||||
optimize: {
|
||||
enabled: false,
|
||||
},
|
||||
|
||||
srcs: ["src/**/*.java"],
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_PACKAGE_NAME := ExamplePlugin
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := SystemUIPluginLib
|
||||
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
@@ -25,9 +25,6 @@
|
||||
<!-- Alias used to reference framework "OK" string in keyguard. -->
|
||||
<item type="string" name="ok">@*android:string/ok</item>
|
||||
|
||||
<!-- Alias used to reference framework "OK" string in keyguard. -->
|
||||
<item type="string" name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</item>
|
||||
|
||||
<!-- Alias used to reference framework configuration for screen rotation. -->
|
||||
<item type="bool" name="config_enableLockScreenRotation">@*android:bool/config_enableLockScreenRotation</item>
|
||||
|
||||
|
||||
40
packages/SystemUI/shared/Android.bp
Normal file
40
packages/SystemUI/shared/Android.bp
Normal file
@@ -0,0 +1,40 @@
|
||||
// Copyright (C) 2017 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.
|
||||
|
||||
android_library {
|
||||
|
||||
name: "SystemUISharedLib",
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
],
|
||||
|
||||
}
|
||||
|
||||
android_app {
|
||||
|
||||
name: "SysUISharedLib",
|
||||
platform_apis: true,
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
"src/**/I*.aidl",
|
||||
],
|
||||
|
||||
static_libs: ["SystemUISharedLib"],
|
||||
|
||||
optimize: {
|
||||
enabled: false,
|
||||
},
|
||||
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright (C) 2017 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.
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_USE_AAPT2 := true
|
||||
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
|
||||
LOCAL_MODULE := SystemUISharedLib
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
LOCAL_JAR_EXCLUDE_FILES := none
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_PACKAGE_NAME := SysUISharedLib
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := SystemUISharedLib
|
||||
|
||||
LOCAL_PROGUARD_ENABLED := disabled
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
@@ -30,10 +30,10 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
|
||||
# Add local path sources as well as shared lib sources
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
|
||||
$(call all-java-files-under, ../src)
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src)
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
SystemUISharedLib \
|
||||
metrics-helper-lib \
|
||||
android-support-test \
|
||||
mockito-target-inline-minus-junit4 \
|
||||
|
||||
@@ -30,37 +30,17 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
|
||||
$(call all-Iaidl-files-under, src) \
|
||||
$(call all-java-files-under, ../src)
|
||||
$(call all-Iaidl-files-under, src)
|
||||
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
|
||||
frameworks/base/packages/SystemUI/res \
|
||||
frameworks/base/packages/SystemUI/res-keyguard \
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
|
||||
LOCAL_STATIC_ANDROID_LIBRARIES := \
|
||||
SystemUIPluginLib \
|
||||
SystemUISharedLib \
|
||||
androidx.car_car \
|
||||
androidx.legacy_legacy-support-v4 \
|
||||
androidx.recyclerview_recyclerview \
|
||||
androidx.preference_preference \
|
||||
androidx.appcompat_appcompat \
|
||||
androidx.mediarouter_mediarouter \
|
||||
androidx.palette_palette \
|
||||
androidx.legacy_legacy-preference-v14 \
|
||||
androidx.leanback_leanback \
|
||||
androidx.slice_slice-core \
|
||||
androidx.slice_slice-view \
|
||||
androidx.slice_slice-builders \
|
||||
androidx.arch.core_core-runtime \
|
||||
androidx.lifecycle_lifecycle-extensions \
|
||||
SystemUI-core
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
metrics-helper-lib \
|
||||
android-support-test \
|
||||
mockito-target-inline-minus-junit4 \
|
||||
SystemUI-proto \
|
||||
SystemUI-tags \
|
||||
testables \
|
||||
truth-prebuilt \
|
||||
|
||||
@@ -70,7 +50,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \
|
||||
libdexmakerjvmtiagent \
|
||||
libmultiplejvmtiagentsinterferenceagent
|
||||
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := \
|
||||
android.test.runner \
|
||||
telephony-common \
|
||||
@@ -112,8 +91,6 @@ jacoco_exclude := $(subst $(space),$(comma),$(patsubst %,%*,$(local_classes)))
|
||||
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.*
|
||||
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := com.android.systemui.tests.*,$(jacoco_exclude)
|
||||
|
||||
include frameworks/base/packages/SettingsLib/common.mk
|
||||
|
||||
ifeq ($(EXCLUDE_SYSTEMUI_TESTS),)
|
||||
include $(BUILD_PACKAGE)
|
||||
endif
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
-->
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="com.android.systemui.tests">
|
||||
|
||||
@@ -72,6 +73,18 @@
|
||||
android:authorities="${applicationId}.lifecycle-tests"
|
||||
android:exported="false"
|
||||
android:multiprocess="true" />
|
||||
<provider android:name="com.android.systemui.keyguard.KeyguardSliceProvider"
|
||||
android:authorities="com.android.systemui.test.keyguard.disabled"
|
||||
android:enabled="false"
|
||||
tools:replace="android:authorities"
|
||||
tools:node="remove" />
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="com.android.systemui.test.fileprovider"
|
||||
android:exported="false"
|
||||
tools:replace="android:authorities"
|
||||
android:grantUriPermissions="true" />
|
||||
</application>
|
||||
|
||||
<instrumentation android:name="android.testing.TestableInstrumentation"
|
||||
|
||||
32
tests/testables/Android.bp
Normal file
32
tests/testables/Android.bp
Normal file
@@ -0,0 +1,32 @@
|
||||
//
|
||||
// Copyright (C) 2017 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.
|
||||
//
|
||||
|
||||
java_library {
|
||||
|
||||
name: "testables",
|
||||
// ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_TAG
|
||||
// LOCAL_MODULE_TAG := tests
|
||||
|
||||
srcs: ["src/**/*.java"],
|
||||
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
"android.test.mock",
|
||||
"android-support-test",
|
||||
"mockito-target-inline-minus-junit4",
|
||||
],
|
||||
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2017 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.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := testables
|
||||
LOCAL_MODULE_TAG := tests
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under,src)
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock \
|
||||
android-support-test \
|
||||
mockito-target-inline-minus-junit4
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||
Reference in New Issue
Block a user