summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/android/ant/chromium-jars.xml5
-rw-r--r--build/android/ant/sdk-targets.xml3
-rwxr-xr-xbuild/android/prepare_library_for_apk2
-rw-r--r--build/apk_test.gypi2
-rw-r--r--build/java.gypi2
-rw-r--r--build/java_apk.gypi2
-rwxr-xr-xtesting/android/generate_native_test.py14
-rw-r--r--testing/android/native_test.gyp2
-rw-r--r--testing/android/native_test_apk.xml1
9 files changed, 13 insertions, 20 deletions
diff --git a/build/android/ant/chromium-jars.xml b/build/android/ant/chromium-jars.xml
index 00785e9..8f5eaa0 100644
--- a/build/android/ant/chromium-jars.xml
+++ b/build/android/ant/chromium-jars.xml
@@ -68,11 +68,6 @@
</condition>
</fail>
- <echo>
- Compiling ${javac.srcdir}, classpath: ${toString:javac.custom.classpath}
- ${javac_includes_message}
- </echo>
-
<javac
srcdir="${javac.srcdir}"
destdir="${dest.dir}"
diff --git a/build/android/ant/sdk-targets.xml b/build/android/ant/sdk-targets.xml
index 6133e25..3ad77e2 100644
--- a/build/android/ant/sdk-targets.xml
+++ b/build/android/ant/sdk-targets.xml
@@ -108,8 +108,6 @@
-->
<if condition="${project.is.testapp}">
<then>
- <echo level="info">Creating test jar file:
- ${ant.project.name}.jar</echo>
<property-location name="create.test.jar.file"
location="${CHROMIUM_SRC}/build/android/ant/create-test-jar.js"/>
<script language="javascript" src="${create.test.jar.file}"/>
@@ -185,7 +183,6 @@
</and>
</condition>
<then>
- <echo message="Copying gdbserver to the apk to enable native debugging"/>
<copy todir="${out.dir}/libs/${target.abi}">
<path refid="native.libs.gdbserver"/>
</copy>
diff --git a/build/android/prepare_library_for_apk b/build/android/prepare_library_for_apk
index ce414b3..ac02977 100755
--- a/build/android/prepare_library_for_apk
+++ b/build/android/prepare_library_for_apk
@@ -15,5 +15,5 @@ ANDROID_STRIP=$1
LIBRARY=$2
STRIPPED=$3
-set -ex
+set -e
$ANDROID_STRIP --strip-unneeded $LIBRARY -o $STRIPPED
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 0ea785c0..c09615c 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -48,6 +48,8 @@
'--app_abi',
'<(android_app_abi)',
'--ant-args',
+ '-quiet',
+ '--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
'--ant-args',
'-DANDROID_SDK=<(android_sdk)',
diff --git a/build/java.gypi b/build/java.gypi
index 0a1df8a..a13c88f 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -129,7 +129,7 @@
'<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',
],
'action': [
- 'ant',
+ 'ant', '-quiet',
'-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
'-DANDROID_SDK=<(android_sdk)',
'-DANDROID_SDK_ROOT=<(android_sdk_root)',
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 0714eb8..6d39188 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -145,7 +145,7 @@
'<(PRODUCT_DIR)/apks/<(apk_name).apk',
],
'action': [
- 'ant',
+ 'ant', '-quiet',
'-DAPP_ABI=<(android_app_abi)',
'-DANDROID_GDBSERVER=<(android_gdbserver)',
'-DANDROID_SDK=<(android_sdk)',
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py
index 563112e..0dbc7d7 100755
--- a/testing/android/generate_native_test.py
+++ b/testing/android/generate_native_test.py
@@ -60,7 +60,7 @@ class NativeTestApkGenerator(object):
self._root_name = None
if self._native_library:
self._root_name = self._LibraryRoot()
- logging.warn('root name: %s', self._root_name)
+ logging.info('root name: %s', self._root_name)
def _LibraryRoot(self):
"""Return a root name for a shared library.
@@ -88,7 +88,7 @@ class NativeTestApkGenerator(object):
os.makedirs(destdir)
elif not '/out/' in destdir:
raise Exception('Unbelievable output directory; bailing for safety')
- logging.warning('rsync %s --> %s', self._SOURCE_FILES, destdir)
+ logging.info('rsync %s --> %s', self._SOURCE_FILES, destdir)
logging.info(cmd_helper.GetCmdOutput(
['rsync', '-aRv', '--delete', '--exclude', '.svn'] +
self._SOURCE_FILES + [destdir], cwd=srcdir))
@@ -100,7 +100,7 @@ class NativeTestApkGenerator(object):
"""
if not self._root_name:
return
- logging.warn('Replacing "replaceme" with ' + self._root_name)
+ logging.info('Replacing "replaceme" with ' + self._root_name)
for f in self._REPLACEME_FILES:
dest = os.path.join(self._output_directory, f)
contents = open(dest).read()
@@ -115,7 +115,7 @@ class NativeTestApkGenerator(object):
if not os.path.exists(destdir):
os.makedirs(destdir)
dest = os.path.join(destdir, os.path.basename(self._native_library))
- logging.warn('strip %s --> %s', self._native_library, dest)
+ logging.info('strip %s --> %s', self._native_library, dest)
cmd_helper.RunCmd(
[self._strip_binary, '--strip-unneeded', self._native_library, '-o',
dest])
@@ -138,10 +138,10 @@ class NativeTestApkGenerator(object):
cmd.append("-DAPP_ABI=" + self._target_abi)
cmd.extend(['-buildfile',
os.path.join(self._output_directory, 'native_test_apk.xml')])
- logging.warn(cmd)
+ logging.info(cmd)
p = subprocess.Popen(cmd, stderr=subprocess.STDOUT)
(stdout, _) = p.communicate()
- logging.warn(stdout)
+ logging.info(stdout)
if p.returncode != 0:
logging.error('Ant return code %d', p.returncode)
sys.exit(p.returncode)
@@ -195,7 +195,7 @@ def main(argv):
target_abi=options.app_abi)
ntag.CreateBundle()
ntag.Compile(options.ant_args)
- logging.warn('COMPLETE.')
+ logging.info('COMPLETE.')
if __name__ == '__main__':
sys.exit(main(sys.argv))
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 80fe486..06f7279 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -32,7 +32,7 @@
'<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk',
],
'action': [
- 'ant',
+ 'ant', '-q',
# TODO: All of these paths are absolute paths right now, while
# we really should be using relative paths for anything that is
# checked in to the Chromium tree (among which the SDK).
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index 545568d..24e5bf5 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -74,7 +74,6 @@ found in the LICENSE file.
<equals arg1="${build.target}" arg2="debug" />
</condition>
<then>
- <echo message="Copying gdbserver to the apk to enable native debugging"/>
<copy todir="${out.dir}/libs/${target.abi}">
<path refid="native.libs.gdbserver"/>
</copy>
generated by cgit v1.1 at 2025-01-16 13:59:42 +0000