diff options
| author |  Googler <noreply@google.com> | 2017-08-31 18:27:19 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-09-01 12:27:12 +0200 |
| commit | 282c7f618af16c86f0055e10711547fa10ab32bb (patch) | |
| tree | 2f714aa430c087f02bead5ef46c5a20a56cc9e0c /src/test/java/com/google/devtools/build | |
| parent | 59141a8fc0f1016f5d1676f6c53e896490343570 (diff) | |
Changed Android manifest merger build action to also resolve relative class names in manifest files for Android libraries.
RELNOTES: none
PiperOrigin-RevId: 167147373
Diffstat (limited to 'src/test/java/com/google/devtools/build')
| -rw-r--r-- | src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java index 37314d5309..9b989adba0 100644 --- a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java +++ b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java @@ -167,7 +167,7 @@ public class ManifestMergerActionTest { final Path libBarManifest = AndroidDataBuilder.of(working.resolve("libBar")) .createManifest("AndroidManifest.xml", "com.google.bar", "<application android:name=\"${applicationId}\">", - "<activity android:name=\"com.google.bar.activityFoo\" />", + "<activity android:name=\".activityFoo\" />", "</application>") .buildUnvalidated() .getManifest(); @@ -192,14 +192,13 @@ public class ManifestMergerActionTest { assertThat(Joiner.on(" ") .join(Files.readAllLines(libBarOutput, UTF_8)) .replaceAll("\\s+", " ").trim()).contains( - "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" - + "<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"" - + " package=\"com.google.libbar\">" - + "<application android:name=\"${applicationId}\">" - + " <activity android:name=\"com.google.bar.activityFoo\">" - + "</activity>" + "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + " <manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"" + + " package=\"com.google.libbar\" >" + + " <application android:name=\"${applicationId}\" >" + + " <activity android:name=\"com.google.bar.activityFoo\" />" + " </application>" - + "</manifest>"); + + " </manifest>"); // binary manifest merging args = generateArgs( |