Commit Graph

25708 Commits

Author SHA1 Message Date
Ying Wang 43f24a323c am aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit 'aecadc06bf49a747c6e0c42dbe8cc73451360db2':
  Don't add build number to apps' version name for platform build.
2015-10-12 17:28:03 +00:00
Ying Wang aecadc06bf Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev 2015-10-12 17:22:45 +00:00
Tao Bao 338da607e8 DO NOT MERGE: Only use a fixed timestamp when packaging.
This CL changes to use a fixed timestamp only when packaging
into the target_files zip.

Bug: 24377993
Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4
(cherry picked from commit 822f5840c0)
2015-10-12 09:55:26 -07:00
Neil Fuller e8304ef768 Fix for Java 8 toolchain builds
We don't need to assume the OpenJDK (i.e. for Mac builds).

Change-Id: I1ac1856813045c7b1478dee6b08ad7b49300e4d7
2015-10-12 17:29:45 +01:00
Joe Fernandez 8563700a72 am 761fcbe7: am fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '761fcbe7920ccc3fc2e85fde2844f19ce9163658':
  add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-10 00:20:36 +00:00
Joe Fernandez 761fcbe792 am fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit 'fed4cf896d2ba46a97bbbb753fd019f98bb42d90':
  add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-10 00:13:38 +00:00
Joe Fernandez fed4cf896d am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '1b5eef1b490cc143474ec74d58369aac9bf6629e':
  add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-10 00:08:09 +00:00
Joe Fernandez 1b5eef1b49 am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit 'b16edb5f3ef9032b7e19c29aac2496c34bb8ac76':
  add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-09 23:59:07 +00:00
Joe Fernandez b16edb5f3e Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev 2015-10-09 23:54:46 +00:00
smain@google.com 3d59345527 add unique ID to each windows download link.
These IDs are necessary for the TOS wall to identify which link should be applied to the download button.

Change-Id: I1b5b8b516a5b8d7fd8433c02011cb4fb2044b71f
2015-10-09 16:30:05 -07:00
Bertrand SIMONNET 4af7259c2d Add the product version to target_files.zip.
When using the A/B updater, include the product version string to
target_files.zip.
This is needed by the Omaha backend.

BUG: 24743570
Change-Id: Idaba06624c1de452b1e1f9d3ebec851229af987a
2015-10-08 16:10:04 -07:00
Bill Yi b3e8bd1842 am 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84\' into HEAD
* commit '96e59f2c34b3174f31b7c7c9ce0a995acb90a6c4':
2015-10-08 21:32:58 +00:00
Dan Albert 7fbbc5d205 Use libgcov OR libclang_rt.profile, not both.
Using both can cause duplicate symbol errors.

Change-Id: Id8ee13a81d32e3248ff1cdc468f49a26ecde6b57
2015-10-08 14:16:39 -07:00
Bill Yi 96e59f2c34 Merge commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84' into HEAD 2015-10-08 10:34:18 -07:00
Yohann Roussel 43b95dcff1 am 6a8146f2: Merge "Ensure dump-words-to-file creates the target"
* commit '6a8146f2a2286dd4be231c22f9d0465c94a3ab00':
  Ensure dump-words-to-file creates the target
2015-10-08 09:15:30 +00:00
Yohann Roussel 6a8146f2a2 Merge "Ensure dump-words-to-file creates the target" 2015-10-08 08:46:45 +00:00
Chih-Wei Huang 7fa65eec72 Remove duplicate local_time.default
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit 567ea28838)

Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
2015-10-08 15:07:23 +08:00
Shinichiro Hamaji ecea601b8a Stop passing --gen_all_phony_targets to kati
6ff74ce8ee

should have made this workaround unnecessary. Now, even with
old build/core, "m -j32 PRODUCT-aosp_mips64-eng dist" does not
output a ninja file with "$(cat )".

Bug: 24384320
Change-Id: I262edf00dce39f39ec4e55d5ed7b1b6f8d931f33
2015-10-08 15:25:16 +09:00
Yohann Roussel f8c63cbac2 Ensure dump-words-to-file creates the target
Even if word list is empty.

Not creating the file was causing print of error messages that were
not preventing compilation to continue when compiling Java module with
no source.

Change-Id: I095b85f85ed6fcef5882afa39d4af51b78124c7c
2015-10-07 09:34:42 +02:00
Zach Jang f414f45e1d am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit 'a78d357d185c1bd45e52ad110d59b53540f2949c':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:33:27 +00:00
Zach Jang a78d357d18 am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit 'a9b2f3030f99650e8af1b7ec35c171801cbcdae6':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:26:51 +00:00
Zach Jang a9b2f3030f am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit '124a59aecc0323c1c80469c3ad5d22305c279a49':
  Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:21:03 +00:00
Zach Jang 124a59aecc Reverting Android Security Patch Level string back to 2015-10-01
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
2015-10-05 18:01:12 -07:00
Brian Carlstrom 10abe69478 am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 20:05:54 +00:00
Brian Carlstrom b43cf69672 am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '848b8e9d2cc9f8229c95b3f2d9f92c97726ad8a6':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 20:00:56 +00:00
Brian Carlstrom 848b8e9d2c am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:53:49 +00:00
Brian Carlstrom fa2ce3b38b am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit 'f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
  Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:47:22 +00:00
Brian Carlstrom f73f79f1b6 Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev 2015-10-04 19:40:41 +00:00
Steve Fung a9722e2927 am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '9782fc4cddac3e31e1e08b1ec86fc61c84a943ec':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 02:02:38 +00:00
Steve Fung 9782fc4cdd am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '46fbaa564071e682e3cef7580723249af153ca71':
  Exclude OTA/bin tools when using A/B OTA updater
2015-10-03 01:55:34 +00:00
Steve Fung 46fbaa5640 Merge "Exclude OTA/bin tools when using A/B OTA updater" 2015-10-03 01:50:54 +00:00
Colin Cross acf00a8c17 am d98fe91a: am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit 'd98fe91a7524d40808ae4ed562aeb38e9eedf593':
  Fix gcc color diagnostics
2015-10-03 00:51:02 +00:00
Colin Cross d98fe91a75 am 6b02b76a: Merge "Fix gcc color diagnostics"
* commit '6b02b76ab9ebb5c21743abc5616379d19bc1c304':
  Fix gcc color diagnostics
2015-10-03 00:43:23 +00:00
Steve Fung 48e49f592f Exclude OTA/bin tools when using A/B OTA updater
The OTA/bin tools are not needed in the target files zip when using
the A/B OTA updater.

Bug: 24577767
Change-Id: I7938a906e4d73709aaa944e8065f922536072e27
2015-10-02 17:23:14 -07:00
Colin Cross 6b02b76ab9 Merge "Fix gcc color diagnostics" 2015-10-02 23:52:58 +00:00
Colin Cross 12adaf5cb9 Fix gcc color diagnostics
gcc color diagnostics stopped working when the flag was moved to
TARGET_GLOBAL_CFLAGS, as that gets overwritten by combo/select.mk.  Put
it back in COMMON_GLOBAL_CFLAGS, and then let the windows build filter
it out, similar to the way clang deals with unknown flags.

Change-Id: I2db221edb893d81f199494e7515d1b9282c12fae
2015-10-02 16:42:10 -07:00
Colin Cross 2f09a63381 am 210d2d08: am b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit '210d2d0863c5d64695e2509d80144d69b5917ecf':
  Move the dist-as-droid handling from make to ninja
2015-10-02 18:08:41 +00:00
Colin Cross 210d2d0863 am b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit 'b9599804877f00fd1efddb18f779216efae14d4f':
  Move the dist-as-droid handling from make to ninja
2015-10-02 18:04:18 +00:00
Colin Cross b959980487 Merge "Move the dist-as-droid handling from make to ninja" 2015-10-02 17:58:20 +00:00
Alex Deymo f9bd3d82f1 am 35907067: am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit '3590706735ac41b6956ef07de20cac3994a046f2':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:52:50 +00:00
Alex Deymo 3590706735 am e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit 'e89dd69c7632e23bf1cf7db5be1cf1b0f6f345f8':
  Pack META/ab_partitions.txt when using the A/B OTA updater.
2015-10-02 03:46:07 +00:00
Alex Deymo e89dd69c76 Merge "Pack META/ab_partitions.txt when using the A/B OTA updater." 2015-10-02 03:40:47 +00:00
Alex Deymo 8925d334c3 Pack META/ab_partitions.txt when using the A/B OTA updater.
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.

Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip

Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
2015-10-01 19:31:18 -07:00
Colin Cross 3b10364b92 am f17f8b49: am 6ec320df: Merge "Have all targets in build.ninja"
* commit 'f17f8b49c92d5a10537cc28f29039e07b1ec17a5':
  Have all targets in build.ninja
2015-10-01 22:59:56 +00:00
Colin Cross f17f8b49c9 am 6ec320df: Merge "Have all targets in build.ninja"
* commit '6ec320df174b6f1dd17023e20fc642f89bb83b4c':
  Have all targets in build.ninja
2015-10-01 22:11:27 +00:00
Colin Cross 6ec320df17 Merge "Have all targets in build.ninja" 2015-10-01 21:13:03 +00:00
Kenny Root 7868208bdc am c58e9de8: am 9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit 'c58e9de8078aedc7b290e15d14ef436860909d55':
  Remove old grandfathered ALL_PREBUILTS
2015-10-01 18:10:46 +00:00
Kenny Root c58e9de807 am 9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '9df1cb507d4d3442c75ca083670bf06938c7d66e':
  Remove old grandfathered ALL_PREBUILTS
2015-10-01 18:05:48 +00:00
Kenny Root 9df1cb507d Merge "Remove old grandfathered ALL_PREBUILTS" 2015-10-01 17:55:05 +00:00
Stephen Hines 1332828b6e Switch from clang 3.6 to new clang repository (with 3.8).
Bug: 23396112

Switch from "-fsanitize-undefined-trap-on-error" to
"-fsanitize-trap=all". The former ends up accidentally leaving
unresolved calls to __ubsan* helper functions in the object file with
clang 3.8. The latter is used when we don't include address sanitizer,
and replaces any misbehavior with a direct call to abort().

Change-Id: I8a67461b45f5f1dd9f2d179b6b64a4ca905e999f
2015-10-01 10:42:15 -07:00