atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

regenerate R.java and Manifest.java to match framework-res.apk

Browse Source
This commit is contained in:
Julian Winkler
2024-03-10 07:18:45 +01:00
committed by Mis012
parent 005e2299bd
commit 1d0ad8132d
5 changed files with 67405 additions and 57236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/meson.build
View File

@@ -1,7 +1,7 @@
aapt = find_program('aapt', required: false) aapt = find_program('aapt', required: false)
if aapt.found() if aapt.found()
aapt_command = [aapt, 'package', '-x', '-f', '-S', join_paths(dir_base, 'res/res'), '-A', join_paths(dir_base, 'res/assets'), '-M', join_paths(dir_base, 'res/AndroidManifest.xml'), '-F', '@OUTPUT@'] aapt_command = [aapt, 'package', '-x', '-f', '-S', join_paths(dir_base, 'res/res'), '-A', join_paths(dir_base, 'res/assets'), '-M', join_paths(dir_base, 'res/AndroidManifest.xml'), '-J', join_paths(dir_base, 'src/api-impl/com/android/internal'), '-F', '@OUTPUT@']
else # fallback to prebuilt APK else # fallback to prebuilt APK
aapt_command = ['cp', join_paths(dir_base, 'res/framework-res.apk'), '@OUTPUT@'] aapt_command = ['cp', join_paths(dir_base, 'res/framework-res.apk'), '@OUTPUT@']
endif endif

5
src/api-impl/android/annotation/SystemApi.java Normal file
View File

@@ -0,0 +1,5 @@
package android.annotation;
public @interface SystemApi {
}

8
src/api-impl/android/content/pm/PackageParser.java
View File

@@ -1545,9 +1545,9 @@ public class PackageParser {
String tagname = parser.getName(); String tagname = parser.getName();
if (tagname.equals("publicKey")) { if (tagname.equals("publicKey")) {
final TypedArray sa = res.obtainAttributes(attrs, final TypedArray sa = res.obtainAttributes(attrs,
com.android.internal.R.styleable.PublicKey); com.android.internal.R.styleable.AndroidManifestPublicKey);
final String encodedKey = sa.getNonResourceString( final String encodedKey = sa.getNonResourceString(
com.android.internal.R.styleable.PublicKey_value); com.android.internal.R.styleable.AndroidManifestPublicKey_value);
currentKey = parsePublicKey(encodedKey); currentKey = parsePublicKey(encodedKey);
if (currentKey == null) { if (currentKey == null) {
Slog.w(TAG, "No valid key in 'publicKey' tag at " + parser.getPositionDescription()); Slog.w(TAG, "No valid key in 'publicKey' tag at " + parser.getPositionDescription());
@@ -1563,9 +1563,9 @@ public class PackageParser {
continue; continue;
} }
final TypedArray sa = res.obtainAttributes(attrs, final TypedArray sa = res.obtainAttributes(attrs,
com.android.internal.R.styleable.KeySet); com.android.internal.R.styleable.AndroidManifestKeySet);
final String name = sa.getNonResourceString( final String name = sa.getNonResourceString(
com.android.internal.R.styleable.KeySet_name); com.android.internal.R.styleable.AndroidManifestKeySet_name);
definedKeySets.get(currentKey).add(name); definedKeySets.get(currentKey).add(name);
sa.recycle(); sa.recycle();
} else if (RIGID_PARSER) { } else if (RIGID_PARSER) {

3226
src/api-impl/com/android/internal/Manifest.java
View File

File diff suppressed because it is too large Load Diff

121400
src/api-impl/com/android/internal/R.java
View File

File diff suppressed because it is too large Load Diff