diff options
| -rw-r--r-- | android_webview/java/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | build/android/ant/chromium-apk.xml | 11 | ||||
| -rw-r--r-- | build/java_apk.gypi | 8 | ||||
| -rw-r--r-- | chrome/android/testshell/java/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | content/shell/android/java/AndroidManifest.xml | 3 |
5 files changed, 20 insertions, 8 deletions
diff --git a/android_webview/java/AndroidManifest.xml b/android_webview/java/AndroidManifest.xml index 03e9908..c3db376 100644 --- a/android_webview/java/AndroidManifest.xml +++ b/android_webview/java/AndroidManifest.xml @@ -10,8 +10,7 @@ package="org.chromium.android_webview"> <application android:name="org.chromium.android_webview.test.AndroidWebViewTestRunnerApplication" - android:label="AndroidWebViewTestRunnerApplication" - android:debuggable="true"> + android:label="AndroidWebViewTestRunnerApplication"> <activity android:name="org.chromium.android_webview.test.AndroidWebViewTestRunnerActivity" android:label="AndroidWebViewTestRunnerActivity"> <intent-filter> diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml index 2779a5e..2c0d33d 100644 --- a/build/android/ant/chromium-apk.xml +++ b/build/android/ant/chromium-apk.xml @@ -3,8 +3,17 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> -<project default="debug"> +<project default="error"> <property name="ant.project.name" value="${APK_NAME}"/> + <!-- + Gyp will pass CONFIGURATION_NAME as the target for ant to build. These targets will call the + appropriate sdk tools target. + --> + <target name="Debug" depends="debug"/> + <target name="Release" depends="release"/> + <target name="error"> + <fail message="CONFIGURATION_NAME should be passed as a target to ant."/> + </target> <description> Building ${ant.project.name}.apk diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 4aa6ea8d..533016f 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -77,6 +77,8 @@ '>@(additional_input_paths)', ], 'outputs': [ + # TODO(cjhopman): Apks are built with a -debug suffix even when they are + # built in release. This should be fixed. '<(PRODUCT_DIR)/apks/<(apk_name)-debug.apk', ], 'action': [ @@ -102,7 +104,11 @@ '-Dbasedir=<(java_in_dir)', '-buildfile', - '<(DEPTH)/build/android/ant/chromium-apk.xml' + '<(DEPTH)/build/android/ant/chromium-apk.xml', + + # Specify CONFIGURATION_NAME as the target for ant to build. The + # buildfile will then build the appropriate SDK tools target. + '<(CONFIGURATION_NAME)', ] }, ], diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml index 837b1a6..5542246 100644 --- a/chrome/android/testshell/java/AndroidManifest.xml +++ b/chrome/android/testshell/java/AndroidManifest.xml @@ -13,8 +13,7 @@ android:protectionLevel="signature" /> <application android:name="org.chromium.chrome.testshell.ChromiumTestShellApplication" - android:label="ChromiumTestShell" - android:debuggable="true"> + android:label="ChromiumTestShell"> <activity android:name="org.chromium.chrome.testshell.ChromiumTestShellActivity" android:label="ChromiumTestShellActivity" android:hardwareAccelerated="true"> diff --git a/content/shell/android/java/AndroidManifest.xml b/content/shell/android/java/AndroidManifest.xml index 26c22b8..c957dcd 100644 --- a/content/shell/android/java/AndroidManifest.xml +++ b/content/shell/android/java/AndroidManifest.xml @@ -13,8 +13,7 @@ android:protectionLevel="signature" /> <application android:name="ContentShellApplication" - android:label="ContentShell" - android:debuggable="true"> + android:label="ContentShell"> <activity android:name="ContentShellActivity" android:launchMode="singleTask" android:theme="@android:style/Theme.Holo.Light.NoActionBar" |