diff options
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | android_webview/java/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android_webview/javatests/AndroidManifest.xml | 3 | ||||
-rw-r--r-- | build/android/ant/chromium-apk.xml | 3 | ||||
-rw-r--r-- | build/android/ant/create-test-jar.js | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | build/android/envsetup.sh | 2 | ||||
-rwxr-xr-x | build/android/process_resources.py | 1 | ||||
-rw-r--r-- | build/java.gypi | 2 | ||||
-rw-r--r-- | build/java_apk.gypi | 2 | ||||
-rw-r--r-- | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java | 8 | ||||
-rw-r--r-- | chrome/android/testshell/java/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | chrome/android/testshell/javatests/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | content/shell/android/java/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | content/shell/android/javatests/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | testing/android/AndroidManifest.xml | 2 |
15 files changed, 22 insertions, 17 deletions
@@ -547,7 +547,7 @@ deps_os = { "android": { "src/third_party/android_tools": Var("chromium_git") + "/android_tools.git" + - "@704c8ddee726aabe0e78bb88545972d2cf298190", + "@fd3cfb745f17fde04c96f28c7ae748720604dd8b", "src/third_party/aosp": "/trunk/deps/third_party/aosp@148330", diff --git a/android_webview/java/AndroidManifest.xml b/android_webview/java/AndroidManifest.xml index c3db376..c5190ee 100644 --- a/android_webview/java/AndroidManifest.xml +++ b/android_webview/java/AndroidManifest.xml @@ -20,7 +20,7 @@ </activity> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> diff --git a/android_webview/javatests/AndroidManifest.xml b/android_webview/javatests/AndroidManifest.xml index c1ac60c..3062283 100644 --- a/android_webview/javatests/AndroidManifest.xml +++ b/android_webview/javatests/AndroidManifest.xml @@ -12,7 +12,8 @@ <provider android:name="TestContentProvider" android:authorities="org.chromium.android_webview.test.TestContentProvider" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> + <!-- TODO(joth): Change minSdkVersion to 16 when crbug/161864 lands. --> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.chromium.android_webview" android:label="Tests for org.chromium.android_webview"/> diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml index 4fce8e9..72c2047 100644 --- a/build/android/ant/chromium-apk.xml +++ b/build/android/ant/chromium-apk.xml @@ -41,6 +41,9 @@ <path id="project.library.res.folder.path"> <filelist files="${ADDITIONAL_RES_DIRS}"/> </path> + <path id="project.library.bin.r.file.path"> + <filelist files="${ADDITIONAL_R_TEXT_FILES}"/> + </path> <script language="javascript"> var before = project.getProperty("ADDITIONAL_RES_PACKAGES"); project.setProperty("project.library.packages", before.replaceAll(" ", ";")); diff --git a/build/android/ant/create-test-jar.js b/build/android/ant/create-test-jar.js index d22c003..d9014a3 100644 --- a/build/android/ant/create-test-jar.js +++ b/build/android/ant/create-test-jar.js @@ -14,7 +14,6 @@ importClass(org.apache.tools.ant.types.FileSet); importClass(org.apache.tools.ant.types.ZipFileSet); importClass(org.apache.tools.ant.taskdefs.Zip); -var echo = project.createTask("echo"); var jarTask = project.createTask("jar"); // Do not allow duplicates in the jar, the default behavior of Jar task @@ -64,7 +63,4 @@ for (var i in excludedClasses) { } jarTask.setExcludes(exclusionString); -echo.setMessage("Creating test jar: " + - jarTask.getDestFile().getAbsolutePath()); -echo.perform(); jarTask.perform(); diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 10d9ec8..7d5024c 100644..100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -81,7 +81,7 @@ the one you want." fi # Android sdk platform version to use -export ANDROID_SDK_VERSION=16 +export ANDROID_SDK_VERSION=17 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then if [[ -z "${TARGET_ARCH}" ]]; then diff --git a/build/android/process_resources.py b/build/android/process_resources.py index 8a46e5c..b0a04af 100755 --- a/build/android/process_resources.py +++ b/build/android/process_resources.py @@ -63,6 +63,7 @@ def main(): '-M', dummy_manifest, '-S', options.res_dir, '-I', android_jar, + '--output-text-symbols', options.R_dir, '-J', options.R_dir]) # Crunch image resources. This shrinks png files and is necessary for 9-patch diff --git a/build/java.gypi b/build/java.gypi index a13c88f..f958132 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -73,6 +73,7 @@ 'crunched_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res', 'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/java_R', 'R_file': '<(R_dir)/<(R_package_relpath)/R.java', + 'R_text_file': '<(R_dir)/R.txt', 'generated_src_dirs': ['<(R_dir)'], 'additional_input_paths': ['<(R_file)'], }, @@ -82,6 +83,7 @@ # generated_R_dirs and additional_R_files. 'generated_R_dirs': ['<(R_dir)'], 'additional_R_files': ['<(R_file)'], + 'additional_R_text_files': ['<(R_text_file)'], # Dependent APKs include this target's resources via # additional_res_dirs and additional_res_packages. diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 6d39188..d183e81 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -165,6 +165,7 @@ '-DJAR_NAME=<(jar_name)', '-DPACKAGE_NAME=<(package_name)', '-DRESOURCE_DIR=<(resource_dir)', + '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)', '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)', '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)', '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)', @@ -189,6 +190,7 @@ # listed in the AndroidManifest.xml, which is unavoidable). 'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'], 'additional_res_packages': ['<(R_package)'], + 'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'], }, }], ], diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java index 0a29bd7..e9113a1 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java @@ -185,7 +185,7 @@ public class ModalDialogTest extends ChromiumTestShellTestBase { JavascriptAppModalDialog jsDialog = getCurrentDialog(); assertNotNull("No dialog showing.", jsDialog); checkButtonPresenceVisibilityText( - jsDialog, 0, org.chromium.content.R.string.stay_on_this_page, + jsDialog, 0, org.chromium.chrome.R.string.stay_on_this_page, "Stay on this page"); clickCancel(jsDialog); @@ -195,7 +195,7 @@ public class ModalDialogTest extends ChromiumTestShellTestBase { jsDialog = getCurrentDialog(); assertNotNull("No dialog showing.", jsDialog); checkButtonPresenceVisibilityText( - jsDialog, 2, org.chromium.content.R.string.leave_this_page, + jsDialog, 2, org.chromium.chrome.R.string.leave_this_page, "Leave this page"); final TestCallbackHelperContainer.OnPageFinishedHelper onPageLoaded = @@ -221,10 +221,10 @@ public class ModalDialogTest extends ChromiumTestShellTestBase { assertNotNull("No dialog showing.", jsDialog); checkButtonPresenceVisibilityText( - jsDialog, 0, org.chromium.content.R.string.dont_reload_this_page, + jsDialog, 0, org.chromium.chrome.R.string.dont_reload_this_page, "Don't reload this page"); checkButtonPresenceVisibilityText( - jsDialog, 2, org.chromium.content.R.string.reload_this_page, + jsDialog, 2, org.chromium.chrome.R.string.reload_this_page, "Reload this page"); } diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml index c48f160..45f0e29 100644 --- a/chrome/android/testshell/java/AndroidManifest.xml +++ b/chrome/android/testshell/java/AndroidManifest.xml @@ -62,7 +62,7 @@ android:exported="false" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> diff --git a/chrome/android/testshell/javatests/AndroidManifest.xml b/chrome/android/testshell/javatests/AndroidManifest.xml index 89ae9e6..40927d6 100644 --- a/chrome/android/testshell/javatests/AndroidManifest.xml +++ b/chrome/android/testshell/javatests/AndroidManifest.xml @@ -12,7 +12,7 @@ <application> <uses-library android:name="android.test.runner" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.chromium.chrome.testshell" android:label="Tests for org.chromium.chrome.testshell"/> diff --git a/content/shell/android/java/AndroidManifest.xml b/content/shell/android/java/AndroidManifest.xml index e177fae..cfeb0c4 100644 --- a/content/shell/android/java/AndroidManifest.xml +++ b/content/shell/android/java/AndroidManifest.xml @@ -61,7 +61,7 @@ android:exported="false" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.INTERNET"/> diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell/android/javatests/AndroidManifest.xml index b2affdb..fcd2465 100644 --- a/content/shell/android/javatests/AndroidManifest.xml +++ b/content/shell/android/javatests/AndroidManifest.xml @@ -12,7 +12,7 @@ <application> <uses-library android:name="android.test.runner" /> </application> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.chromium.content_shell" android:label="Tests for org.chromium.content_shell"/> diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml index 9a83125..27e4bb7 100644 --- a/testing/android/AndroidManifest.xml +++ b/testing/android/AndroidManifest.xml @@ -10,7 +10,7 @@ found in the LICENSE file. android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <application android:label="ChromeNativeTests"> <activity android:name=".ChromeNativeTestActivity" |