Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: build/android/tests/bad_resources/app/java/AndroidManifest.xml

Issue 1136653002: Reland: Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle APKs with no resources and add a --include-all-resources option Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- 2 <!--
3 - Copyright 2013 Google Inc. 3 - Copyright 2013 Google Inc.
4 - 4 -
5 - Licensed under the Apache License, Version 2.0 (the "License"); you may not 5 - Licensed under the Apache License, Version 2.0 (the "License"); you may not
6 - use this file except in compliance with the License. You may obtain a copy 6 - use this file except in compliance with the License. You may obtain a copy
7 - of the License at 7 - of the License at
8 - 8 -
9 - http://www.apache.org/licenses/LICENSE-2.0 9 - http://www.apache.org/licenses/LICENSE-2.0
10 - 10 -
11 - Unless required by applicable law or agreed to in writing, software 11 - Unless required by applicable law or agreed to in writing, software
12 - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 12 - distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13 - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 13 - WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14 - License for the specific language governing permissions and limitations 14 - License for the specific language governing permissions and limitations
15 - under the License. 15 - under the License.
16 --> 16 -->
17 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 17 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
18 package="dummy" 18 package="dummy"
19 android:versionCode="1" 19 android:versionCode="1"
20 android:versionName="1.0"> 20 android:versionName="1.0">
21 <uses-sdk android:minSdkVersion="1" android:targetSdkVersion="22" />
21 <application android:label="dummy"> 22 <application android:label="dummy">
22 <activity android:name="dummy.DummyActivity" 23 <activity android:name="dummy.DummyActivity"
23 android:label="dummy"> 24 android:label="dummy">
24 <intent-filter> 25 <intent-filter>
25 <action android:name="android.intent.action.MAIN" /> 26 <action android:name="android.intent.action.MAIN" />
26 <category android:name="android.intent.category.LAUNCHER" /> 27 <category android:name="android.intent.category.LAUNCHER" />
27 </intent-filter> 28 </intent-filter>
28 </activity> 29 </activity>
29 </application> 30 </application>
30 </manifest> 31 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698