Commit Graph

10777 Commits

Author SHA1 Message Date
Ying Wang
40c185f545 Merge "Don\'t reset LOCAL_*MODULE_STEM." am: e77e5e7
am: 07ad876

* commit '07ad8765abefd43b2290e1fc61dc17a69e423f42':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: I55821cf233aa78f3e451c0b1fa255864b63b9749
2016-04-19 21:02:22 +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
Zach Jang
0a3b3d40c1 Update security patch string to 2016-06-01
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -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
a8b2e0c936 Merge "Revert "Use strip mode mini-debug-info by default."" am: b34f69f
am: 0ad5936

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

Change-Id: I2cbf9500c5271f67e59b4cfeb8a91b953d9db184
2016-04-19 03:51:38 +00: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
b79618a622 Merge "Use strip mode mini-debug-info by default." am: c7eab6d
am: ab721f0

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

Change-Id: I5d82142dbcd188fd88ec68c6cfa926147d2d5339
2016-04-19 03:00:30 +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
bd581f6959 Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase." am: 7984620
am: d7c070f

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

Change-Id: I9e1c63516f5729f97a9bcf5e664715e63c05dbc4
2016-04-18 18:40:47 +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
b10a1190cb Merge "Add strip mode mini-debug-info." am: 9a02623
am: 3cb18ef

* commit '3cb18efc4a4ec9497a237e8151ebc3b15857c837':
  Add strip mode mini-debug-info.

Change-Id: Ic915892d0cc7142ec7ce2847cc4a69a3d24a54c3
2016-04-16 00:36:07 +00: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
Sebastien Hertz
ad84f802fc Merge "Allow to force min sdk given to Jack" into nyc-dev 2016-04-14 23:17:18 +00:00
Tao Bao
d337f5614c Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev
am: 8fe9274

* commit '8fe9274ab99a0a5e8894a8984d47a9c5a9c0c17c':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: I1e6830d90b471c70d6de450e0f0c04943dc38fec
2016-04-14 22:20:45 +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
Tao Bao
8fe9274ab9 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev 2016-04-14 22:11:18 +00:00
Yohann Roussel
a1d82ef12e Merge "Allow to force min sdk given to Jack" am: 6f4f2a7
am: bd65cc3

* commit 'bd65cc387b1becad1b9c5179f7932bd339b8cf9f':
  Allow to force min sdk given to Jack

Change-Id: I55b673b0bb52e4f6f3d4265279528e353a157550
2016-04-14 21:37:25 +00: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
d98c42071a 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

(cherry picked from commit 109141ccc9)

Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
2016-04-14 23:25:14 +02: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
Tao Bao
cffaf73f84 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
2016-04-14 13:33:35 -07:00
Ying Wang
2e2c137913 Reject Google's build of JDK.
Bug: 28097637

(cherry picked from commit 22b23b9b00)

Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
2016-04-14 12:30:25 -07:00
Ying Wang
55fb35281e Merge "Reject Google\'s build of JDK." am: 98f7a5c
am: cb9847c

* commit 'cb9847c8abb89bb37d9429aeb1862d04d378ccce':
  Reject Google's build of JDK.

Change-Id: Ia33b50111b7dc8ea09552bc89ba6beb913ddd7ab
2016-04-14 19:01:56 +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
39b6a8db6a Merge "Add support for Brillo partitioning." am: 2528968
am: 93a3423

* commit '93a34234c6a032251163992728def631c14a6e90':
  Add support for Brillo partitioning.

Change-Id: I349463c75e8ddb312cf83bad845864e530c50405
2016-04-14 16:20:15 +00: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
aa6b73b784 Merge "Always use ensure_start to ensure goma\'s daemon runs" am: f221cbb
am: 75b1a39

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

Change-Id: I77a95ce9fdb30d5205fb6552d0b1d745faaedb22
2016-04-13 05:16:18 +00: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
Ying Wang
edb07245a6 Include classes.jar with class files in aar.
am: 8419b7f

* commit '8419b7f35e2609d98a9da38e56e1839e21d4a298':
  Include classes.jar with class files in aar.

Change-Id: I30c12caf4a364d9586fd60bebeac929145ef6be3
2016-04-12 22:49:48 +00:00
Andreas Gampe
4b941608e9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" into nyc-dev 2016-04-12 22:19:04 +00:00
Treehugger Robot
008b9c5624 Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" am: 5f3b368
am: 02b786c

* commit '02b786ce2d370cb5d3a33de9b61a9255114f978d':
  Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Change-Id: I978f51fe6561f60e8f054b4314d77fcc6136bcb5
2016-04-12 22:14:48 +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