Merge "Add jeffdq@ to core/res/OWNERS to support notification template work" into main
diff --git a/config/Android.bp b/config/Android.bp
index dd681ca..adce203 100644
--- a/config/Android.bp
+++ b/config/Android.bp
@@ -29,6 +29,13 @@
],
}
+prebuilt_etc {
+ name: "preloaded-classes",
+ src: "preloaded-classes",
+ filename: "preloaded-classes",
+ installable: false,
+}
+
filegroup {
name: "preloaded-classes-denylist",
srcs: ["preloaded-classes-denylist"],
diff --git a/core/java/android/app/admin/EnterprisePlatform_OWNERS b/core/java/android/app/admin/EnterprisePlatform_OWNERS
index 4d1ed590..9da526f 100644
--- a/core/java/android/app/admin/EnterprisePlatform_OWNERS
+++ b/core/java/android/app/admin/EnterprisePlatform_OWNERS
@@ -1,2 +1,3 @@
sandness@google.com #{LAST_RESORT_SUGGESTION}
-scottjonathan@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file
+scottjonathan@google.com #{LAST_RESORT_SUGGESTION}
+rubinxu@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file
diff --git a/libs/WindowManager/Shell/tests/OWNERS b/libs/WindowManager/Shell/tests/OWNERS
index d718e15..0f24bb5 100644
--- a/libs/WindowManager/Shell/tests/OWNERS
+++ b/libs/WindowManager/Shell/tests/OWNERS
@@ -12,3 +12,4 @@
nmusgrave@google.com
pbdr@google.com
tkachenkoi@google.com
+mpodolian@google.com
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 994adc9..4c81939 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -227,56 +227,3 @@
],
},
}
-
-cc_genrule {
- name: "aapt2_results",
- srcs: [
- ":aapt2_tests",
- "integration-tests/CompileTest/**/*",
- "integration-tests/CommandTests/**/*",
- "integration-tests/ConvertTest/**/*",
- "integration-tests/DumpTest/**/*",
- ],
- host_supported: true,
- device_supported: false,
- target: {
- windows: {
- compile_multilib: "64",
- },
- },
- out: ["result.xml"],
- cmd: "mkdir -p $(genDir)/integration-tests/CompileTest/ && " +
- "cp $(locations integration-tests/CompileTest/**/*) $(genDir)/integration-tests/CompileTest/ && " +
- "mkdir -p $(genDir)/integration-tests/CommandTests/ && " +
- "cp $(locations integration-tests/CommandTests/**/*) $(genDir)/integration-tests/CommandTests/ && " +
- "mkdir -p $(genDir)/integration-tests/ConvertTest/ && " +
- "cp $(locations integration-tests/ConvertTest/**/*) $(genDir)/integration-tests/ConvertTest/ && " +
- "mkdir -p $(genDir)/integration-tests/DumpTest/ && " +
- "cp $(locations integration-tests/DumpTest/**/*) $(genDir)/integration-tests/DumpTest/ && " +
- "cp $(locations :aapt2_tests) $(genDir)/ && " +
- "$(genDir)/aapt2_tests " +
- "--gtest_output=xml:$(out) " +
- ">/dev/null 2>&1 ; true",
- dist: {
- targets: ["aapt2_run_host_unit_tests"],
- dir: "gtest",
- dest: "aapt2_host_unit_tests_result.xml",
- },
- arch: {
- x86: {
- dist: {
- suffix: "_x86",
- },
- },
- x86_64: {
- dist: {
- suffix: "_x86_64",
- },
- },
- },
-}
-
-phony_rule {
- name: "aapt2_run_host_unit_tests",
- phony_deps: ["aapt2_results"],
-}