diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:17:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:17:04 +0000 |
| commit | 1966f0000d7773128ea77f420ee71ad3675a978d (patch) | |
| tree | 9a823d874176bd33112ceadf0a6a727839e3cea2 | |
| parent | b5b044ad0c35ee13b7e96a0df88024b7b7370ad1 (diff) | |
| parent | 521ad2594c2dcffd3866f38b4198c3ba81d09328 (diff) | |
| download | platform-compat-android14-mainline-permission-release.tar.gz | |
Snap for 10453563 from 521ad2594c2dcffd3866f38b4198c3ba81d09328 to mainline-permission-releaseaml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release
Change-Id: I4630bc8cbec26297ef94d3e108da8be3df081f14
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | build/Android.bp | 8 | ||||
| -rw-r--r-- | java/android/compat/testing/Classpaths.java | 1 | ||||
| -rw-r--r-- | java/android/processor/compat/changeid/ChangeIdProcessor.java | 2 | ||||
| -rw-r--r-- | java/android/processor/compat/unsupportedappusage/UnsupportedAppUsageProcessor.java | 2 | ||||
| -rw-r--r-- | java/com/android/class2nonsdklist/Class2NonSdkList.java | 1 |
6 files changed, 5 insertions, 11 deletions
@@ -1,3 +1,3 @@ ancr@google.com hsnali@google.com -robertogil@google.com
\ No newline at end of file +robertogil@google.com diff --git a/build/Android.bp b/build/Android.bp index 29131b6..59b2a9f 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -23,11 +23,7 @@ python_binary_host { main: "process_compat_config.py", srcs: ["process_compat_config.py"], version: { - py2: { - enabled: false, - }, py3: { - enabled: true, embedded_launcher: true, }, }, @@ -41,11 +37,7 @@ python_test_host { "process-compat-config-test.py", ], version: { - py2: { - enabled: false, - }, py3: { - enabled: true, embedded_launcher: true, }, }, diff --git a/java/android/compat/testing/Classpaths.java b/java/android/compat/testing/Classpaths.java index 3830ec9..bbc2ab4 100644 --- a/java/android/compat/testing/Classpaths.java +++ b/java/android/compat/testing/Classpaths.java @@ -61,6 +61,7 @@ public final class Classpaths { BOOTCLASSPATH, DEX2OATBOOTCLASSPATH, SYSTEMSERVERCLASSPATH, + STANDALONE_SYSTEMSERVER_JARS, } private static final String TEST_RUNNER = "androidx.test.runner.AndroidJUnitRunner"; diff --git a/java/android/processor/compat/changeid/ChangeIdProcessor.java b/java/android/processor/compat/changeid/ChangeIdProcessor.java index 57d4036..a3d3025 100644 --- a/java/android/processor/compat/changeid/ChangeIdProcessor.java +++ b/java/android/processor/compat/changeid/ChangeIdProcessor.java @@ -55,7 +55,7 @@ import javax.tools.FileObject; * Design doc: go/gating-and-logging. */ @SupportedAnnotationTypes({"android.compat.annotation.ChangeId"}) -@SupportedSourceVersion(SourceVersion.RELEASE_11) +@SupportedSourceVersion(SourceVersion.RELEASE_17) public class ChangeIdProcessor extends SingleAnnotationProcessor { private static final String CONFIG_XML = "compat_config.xml"; diff --git a/java/android/processor/compat/unsupportedappusage/UnsupportedAppUsageProcessor.java b/java/android/processor/compat/unsupportedappusage/UnsupportedAppUsageProcessor.java index 782ae4e..bf83f4a 100644 --- a/java/android/processor/compat/unsupportedappusage/UnsupportedAppUsageProcessor.java +++ b/java/android/processor/compat/unsupportedappusage/UnsupportedAppUsageProcessor.java @@ -54,7 +54,7 @@ import javax.tools.FileObject; * annotation. */ @SupportedAnnotationTypes({"android.compat.annotation.UnsupportedAppUsage"}) -@SupportedSourceVersion(SourceVersion.RELEASE_11) +@SupportedSourceVersion(SourceVersion.RELEASE_17) public final class UnsupportedAppUsageProcessor extends SingleAnnotationProcessor { private static final String GENERATED_INDEX_FILE_EXTENSION = ".uau"; diff --git a/java/com/android/class2nonsdklist/Class2NonSdkList.java b/java/com/android/class2nonsdklist/Class2NonSdkList.java index e5ef5f4..b8385d5 100644 --- a/java/com/android/class2nonsdklist/Class2NonSdkList.java +++ b/java/com/android/class2nonsdklist/Class2NonSdkList.java @@ -76,6 +76,7 @@ public class Class2NonSdkList { map.put(31, FLAG_MAX_TARGET_S); map.put(32, FLAG_UNSUPPORTED); map.put(33, FLAG_UNSUPPORTED); + map.put(34, FLAG_UNSUPPORTED); map.put(10000, FLAG_UNSUPPORTED); // VMRuntime.SDK_VERSION_CUR_DEVELOPMENT TARGET_SDK_TO_LIST_MAP = Collections.unmodifiableMap(map); } |