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

res/meson.build

@@ -1,7 +1,7 @@
 aapt = find_program('aapt', required: false)
 
 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
   aapt_command = ['cp', join_paths(dir_base, 'res/framework-res.apk'), '@OUTPUT@']
 endif

src/api-impl/android/annotation/SystemApi.java

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

src/api-impl/android/content/pm/PackageParser.java

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