Commit Graph

9127 Commits

Author SHA1 Message Date
Ying Wang
c24740fdc8 Merge "Allow to build native tests for translation arch only." 2016-04-20 20:58:17 +00:00
Ying Wang
626302262c Allow to build native tests for translation arch only.
- To build a native test for translation arch only, use:
  LOCAL_MODULE_TARGET_ARCH := <translation arch>
- Also disable building .odex for translation arch for Java libraries.

Bug: 27526885
Change-Id: I063e8876781c4424da7abebf1b9b7cb842ce205f
(cherry-pick from commit d90eb21cd7)
2016-04-20 13:57:22 -07:00
Colin Cross
b7f7204f33 Merge "Make jack_check_timestamp depend on setup-jack-server"
am: e982d92

* commit 'e982d92bb740e19a62566eb303c9abaccf475442':
  Make jack_check_timestamp depend on setup-jack-server

Change-Id: I0a2a37e2e286dff028ea60c5bfead0247c9cbc73
2016-04-20 12:15:03 +00:00
Colin Cross
5cde746042 Make jack_check_timestamp depend on setup-jack-server
Some builds were failing with:
[  3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'

While jack-admin was running concurrently:
[  3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar  2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher

(cherry picked from commit febe2bcc21)

Change-Id: I406afc87b4f7dda49406c4e1674430d223914e8d
2016-04-20 09:36:45 +02:00
Duane Sand
181e93f19c Merge "Enable asan/ubsan for mips"
am: a58cefb

* commit 'a58cefb6834fefe411c0b14782d2e5ad8c148389':
  Enable asan/ubsan for mips

Change-Id: I2af83d34fa183a2eecbe4f16e4ff5579d8d8ca3c
2016-04-20 04:50:58 +00:00
Stephen Hines
a58cefb683 Merge "Enable asan/ubsan for mips" 2016-04-20 04:44:39 +00:00
Ying Wang
07ad8765ab Merge "Don\'t reset LOCAL_*MODULE_STEM."
am: e77e5e7

* commit 'e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
2016-04-19 20:58:58 +00:00
Ying Wang
c160c3f21a Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.

Bug: 27775991
Change-Id: I36d1ff3d177818677fb38bdb3d340dd2ff34c404
2016-04-19 12:20:47 -07:00
Shinichiro Hamaji
3deb87d5fd Add input dependencies to .img targets
They should have build/tools/releasetools/*.py as their
prerequisites.

Bug: 27954979
Change-Id: I51595fc91caaad38be3e47befb5df7ac2683bf14
2016-04-19 18:41:27 +09:00
Neil Fuller
ca9d53f883 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"
am: 8c5698d

* commit '8c5698d220d4eb6bbba965c070d2fb792de6f3c1':
  Add core-lambda-stubs to default classpath for target libs compiling using javac

Change-Id: I8b6557aee0c120ea3c63bc0948c1109ca1b9a9e1
2016-04-19 08:18:31 +00:00
Neil Fuller
8c5698d220 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" 2016-04-19 08:13:23 +00:00
Shinichiro Hamaji
d50001e74a Add normalize_path.py to prerequisites
Bug: 27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976
2016-04-19 16:22:27 +09:00
Yabin Cui
0ad593683e Merge "Revert "Use strip mode mini-debug-info by default.""
am: b34f69f

* commit 'b34f69f8499fe699edaca8715bed13b884cb9669':
  Revert "Use strip mode mini-debug-info by default."

Change-Id: Ie234fc5a11933a3364c34981f110f25f6f0842b8
2016-04-19 03:48:49 +00:00
Yabin Cui
b34f69f849 Merge "Revert "Use strip mode mini-debug-info by default."" 2016-04-19 03:42:04 +00:00
Yabin Cui
3aa7df592b Revert "Use strip mode mini-debug-info by default."
This reverts commit 0e131e7e2c.

breaks in aosp_mips-eng

Change-Id: I468b0a47c878ffde9afc78442e8d4f0dabf7eb6e
2016-04-19 03:38:34 +00:00
Yabin Cui
ab721f0a5f Merge "Use strip mode mini-debug-info by default."
am: c7eab6d

* commit 'c7eab6db2743abd98c6a5123c4f8764463547bd6':
  Use strip mode mini-debug-info by default.

Change-Id: Ibc7d3304a52b9dcf5573506b6ad5df35ec4ef167
2016-04-19 02:57:41 +00:00
Yabin Cui
c7eab6db27 Merge "Use strip mode mini-debug-info by default." 2016-04-19 02:52:21 +00:00
Dan Austin
d7c070f4a0 Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
am: 7984620

* commit '798462046192ede9e723672016da5f7aa17fc988':
  Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.

Change-Id: Ie67479e1157d97f5b42f42b086bdaf31d738e398
2016-04-18 18:35:09 +00:00
Dan Austin
7984620461 Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase." 2016-04-18 18:23:11 +00:00
Neil Fuller
eed17d84cc Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
(cherry picked from commit b08544ed7d)

Change-Id: Ie82600da21a9dbe2348e96aef1c5e966a7a1ef5a
2016-04-18 16:38:54 +01:00
Yabin Cui
0e131e7e2c Use strip mode mini-debug-info by default.
Bug: 27923447
Change-Id: If52eed69ea5c2e91bffacdb8520bf53deafced3e
2016-04-15 17:42:17 -07:00
Yabin Cui
3cb18efc4a Merge "Add strip mode mini-debug-info."
am: 9a02623

* commit '9a02623eb66519a2b4607daa883607e893f7727f':
  Add strip mode mini-debug-info.

Change-Id: Ia856b0af684e62b2d17a4a92015afcb02992f523
2016-04-16 00:33:39 +00:00
Yabin Cui
9a02623eb6 Merge "Add strip mode mini-debug-info." 2016-04-16 00:23:50 +00:00
Yabin Cui
fab7995cd8 Add strip mode mini-debug-info.
Mini-debug-info strip mode strips most debug information, but
maintains minimal debugging information similar to
https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html.

Bug: 27923447

Change-Id: I0405f0b3c33cb3cadeafbd22ce94d645c4dbe7b9
2016-04-15 16:12:00 -07:00
Tao Bao
9dba034d25 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
am: 8191f12

* commit '8191f1231dfe45923e8a060635bf7ccbe025a665':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: Ia035b329e08ac6baeb1a48de0bc59ae23771b7c8
2016-04-14 23:22:55 +00:00
Tao Bao
d5cd404f6e Makefile: Pack squashfs and f2fs tools into otatools.zip.
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).

squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh

Bug: 28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
(cherry picked from commit cffaf73f84)
2016-04-14 15:13:46 -07:00
Yohann Roussel
bd65cc387b Merge "Allow to force min sdk given to Jack"
am: 6f4f2a7

* commit '6f4f2a77939e8de843a9eb70e92e32c8054d74d5':
  Allow to force min sdk given to Jack

Change-Id: I029e852c82cd2fd20739b466917542211397757c
2016-04-14 21:33:33 +00:00
Yohann Roussel
6f4f2a7793 Merge "Allow to force min sdk given to Jack" 2016-04-14 21:14:38 +00:00
Yohann Roussel
109141ccc9 Allow to force min sdk given to Jack
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4
2016-04-14 20:59:47 +00:00
Ying Wang
cb9847c8ab Merge "Reject Google\'s build of JDK."
am: 98f7a5c

* commit '98f7a5c7446ceae437642934f3e49c870deb8066':
  Reject Google's build of JDK.

Change-Id: Ie818a54ea90d960e4b570b96c006e51e32d8b76f
2016-04-14 18:58:23 +00:00
Ying Wang
98f7a5c744 Merge "Reject Google's build of JDK." 2016-04-14 18:49:07 +00:00
Ying Wang
22b23b9b00 Reject Google's build of JDK.
Bug: 28097637
Change-Id: I8afbd48230bdd1f198a873f72df1c178bed38d0e
2016-04-14 11:34:04 -07:00
David Zeuthen
93a34234c6 Merge "Add support for Brillo partitioning."
am: 2528968

* commit '2528968871cb43a775b059a9300a7cd907c3cfce':
  Add support for Brillo partitioning.

Change-Id: I64897c61190f0674ec006d3ddf3af4342d9b8970
2016-04-14 16:16:35 +00:00
David Zeuthen
25328627ba Add support for Brillo partitioning.
To generate partition tables in the Android build system, simply add
the path to a .bpt file to the BOARD_BPT_INPUT_FILES variable.

 BOARD_BPT_INPUT_FILES += "hardware/bsp/vendor/soc/board/board-specific.bpt"

The variable BOARD_BPT_DISK_SIZE can be used to specify or override
the disk size, for example:

 BOARD_BPT_DISK_SIZE := "10 GiB"

Additional arguments to 'bpttool make_table' can be specified in the
variable BOARD_BPT_MAKE_TABLE_ARGS.

If BOARD_BPT_INPUT_FILES is set, the build system generates two files

 partition-table.img
 partition-table.bpt

in ${ANDROID_PRODUCT_OUT} using 'bpttool make_table'. The former is
the binary partition tables generated using bptool's --output_gpt
option and the latter is a JSON file generated using the --output_json
option. These files will also be put in the IMAGES/ directory of
target-files.zip when running 'm dist'.

BUG=27831397
TEST=Manually tested.

Change-Id: Iedd15354afb2dd483dcb9bc001360b2a37fd6dc0
2016-04-13 12:45:20 -04:00
Shinichiro Hamaji
75b1a3945c Merge "Always use ensure_start to ensure goma\'s daemon runs"
am: f221cbb

* commit 'f221cbba4255a0ade9a222715bb401c544250939':
  Always use ensure_start to ensure goma's daemon runs

Change-Id: I57af0d64742ddf4585cfcc036f53244e0c2d6226
2016-04-13 05:13:20 +00:00
Shinichiro Hamaji
f221cbba42 Merge "Always use ensure_start to ensure goma's daemon runs" 2016-04-13 05:07:01 +00:00
Christopher Wiley
02b786ce2d Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
am: 5f3b368

* commit '5f3b3689af234bf5b16671cc01ae4d14956fac0a':
  Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Change-Id: I38db1f575907c48355d8e88e52d273bedc3b139a
2016-04-12 22:12:07 +00:00
Treehugger Robot
5f3b3689af Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" 2016-04-12 21:24:51 +00:00
Christopher Wiley
ff1c3f2b05 Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Listing a library in any of:

  LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
  LOCAL_EXPORT_STATIC_LIBRARY_HEADERS

will cause the headers exported by that library to be exported from
the current library target as well.

This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.

Bug: 27804373
Test: Introduced dependency on libbase to libbinder at the header level.
      Libraries that consume libbinder do not need to explicitly depend
      on libbase.

Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d
2016-04-12 09:27:29 -07:00
Shinichiro Hamaji
91609e249a Always use ensure_start to ensure goma's daemon runs
Recent goma client automatically restarts when GOMA_*
environment variable changes. http://b/25676777 was fixed
2 months ago, so there wouldn't be old goma client.

Change-Id: I3b5419ce4bae4cf8180d8d0a53d2b4218d317fec
2016-04-12 18:14:28 +09:00
Andreas Gampe
c0f254a5b9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
am: 8a547f1

* commit '8a547f19b859e06baaf3c9495f3a2fc0eaa5905d':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: If44d2747e10e2b549e83c96f1916ca05b9af9d04
2016-04-12 03:01:39 +00:00
Andreas Gampe
907fb03273 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-11 15:10:09 -07:00
Sebastien Hertz
e0f8435306 Merge "Update code coverage filtering"
am: cb49804

* commit 'cb49804e06adab2882bbcd15230b188f4977eb5a':
  Update code coverage filtering

Change-Id: Ia7f5f6a659cea62553865bb1030bc76e48c99b57
2016-04-11 14:41:01 +00:00
Sebastien Hertz
cb49804e06 Merge "Update code coverage filtering" 2016-04-11 14:31:35 +00:00
Sebastien Hertz
74ec3f49d1 Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424
Change-Id: Ic29c99b6feb7ea2251c29d659e7ea1f1c46d1ed1
2016-04-08 10:26:49 +02:00
Shinichiro Hamaji
ac61fedf9e Merge "Add jack\'s argument files to prerequisites"
am: 06dbe19

* commit '06dbe198b9f50d71bf24b52819110594007b14ae':
  Add jack's argument files to prerequisites

Change-Id: Ib95413246000676fc050ee1c1e892dd8ea1b6b3f
2016-04-08 04:55:11 +00:00
Colin Cross
4e2c57ab0a Pass SANTIIZE_HOST and SANITIZE_TARGET to soong
Change-Id: I80e2e386db3367383454adb1b0785b10e13a4c58
2016-04-07 13:33:06 -07:00
Shinichiro Hamaji
4eaeef8df7 Add jack's argument files to prerequisites
Dex files should be updated when jack-default.args or
proguard*.flags are modified.

Bug: 27954979
Change-Id: I72a7084302f4ef92a89a8068f03f790dd7acd582
2016-04-07 18:56:42 +09:00
Shinichiro Hamaji
06af80f6c4 Merge "Add Bison binary and its data to prerequisite"
am: 4d69fbf

* commit '4d69fbf5beeb7f56c878ed8b3286b23521029f74':
  Add Bison binary and its data to prerequisite

Change-Id: I5ee7077db82707a4aaa5c7801e8dbc0b564316bb
2016-04-07 03:53:42 +00:00
Shinichiro Hamaji
ae917433aa Merge "Fix dependencies of protoc with nanopb-c plugin"
am: 5e2d7f3

* commit '5e2d7f320423bddb5494cdc1564afa040b98d004':
  Fix dependencies of protoc with nanopb-c plugin

Change-Id: Ib343e45fbe14ac06cb0b8205952cbfc3d57b59c6
2016-04-07 03:53:41 +00:00