OSDN Git Service
Ying Wang [Sun, 18 Oct 2015 17:12:27 +0000 (10:12 -0700)]
am
4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '
4f6f0f924eba9f80493861a9e7ff7f40f9924aa2':
If a console doesn't exist, read password from stdin.
Ying Wang [Sun, 18 Oct 2015 17:07:28 +0000 (17:07 +0000)]
Merge "If a console doesn't exist, read password from stdin."
Tao Bao [Fri, 16 Oct 2015 22:46:31 +0000 (15:46 -0700)]
am
ac39bef4: Merge "common.py: Fix the build."
* commit '
ac39bef43fb032bff75b8558f54107e733355265':
common.py: Fix the build.
Tao Bao [Fri, 16 Oct 2015 22:41:45 +0000 (22:41 +0000)]
Merge "common.py: Fix the build."
Tao Bao [Fri, 16 Oct 2015 22:26:34 +0000 (15:26 -0700)]
common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
Tao Bao [Fri, 16 Oct 2015 21:49:40 +0000 (14:49 -0700)]
am
543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '
543b28d42f8fdebe011a906826251ab8df70a226':
Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 21:42:34 +0000 (21:42 +0000)]
Merge "Pass source's info_dict to vendor's releasetools.py."
Ying Wang [Fri, 16 Oct 2015 01:25:15 +0000 (01:25 +0000)]
am
19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '
19e4741df60643d4fdb876e77069bb63857a12b2':
Use direct dependency on the JNI so files.
Ying Wang [Fri, 16 Oct 2015 01:19:48 +0000 (01:19 +0000)]
Merge "Use direct dependency on the JNI so files."
Ying Wang [Thu, 15 Oct 2015 22:29:01 +0000 (15:29 -0700)]
Use direct dependency on the JNI so files.
With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.
Bug:
24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
Dan Albert [Thu, 15 Oct 2015 18:48:42 +0000 (18:48 +0000)]
am
5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '
5baea1436371dea7e14562b17431bcd2b6a55f7d':
Use libgcov OR libclang_rt.profile, not both.
Ying Wang [Thu, 15 Oct 2015 18:39:45 +0000 (18:39 +0000)]
am
f1b066b5: Merge "Remove duplicate local_time.default"
* commit '
f1b066b5ce3ebec905cb38dbb48a77dc58d4c457':
Remove duplicate local_time.default
Dan Albert [Thu, 15 Oct 2015 18:39:42 +0000 (18:39 +0000)]
Merge "Use libgcov OR libclang_rt.profile, not both."
Ying Wang [Thu, 15 Oct 2015 18:35:26 +0000 (18:35 +0000)]
Merge "Remove duplicate local_time.default"
Steve Fung [Thu, 15 Oct 2015 18:19:52 +0000 (18:19 +0000)]
am
2af58637: Merge "Add the Product ID to target_files.zip"
* commit '
2af586376d2b99c75a5672c72a704f2031adc0fe':
Add the Product ID to target_files.zip
Steve Fung [Thu, 15 Oct 2015 18:13:41 +0000 (18:13 +0000)]
Merge "Add the Product ID to target_files.zip"
Nick Kralevich [Thu, 15 Oct 2015 09:46:45 +0000 (09:46 +0000)]
am
5c24a50e: Merge "generic_x86: delete system_server execmem"
* commit '
5c24a50e5fba6aad3319edc0770005e20ac0b9e1':
generic_x86: delete system_server execmem
Nick Kralevich [Thu, 15 Oct 2015 09:42:17 +0000 (09:42 +0000)]
Merge "generic_x86: delete system_server execmem"
Nick Kralevich [Thu, 15 Oct 2015 09:37:40 +0000 (02:37 -0700)]
generic_x86: delete system_server execmem
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.
Fixes the following build breakage:
libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
libsepol.check_assertions: 1 neverallow failures occurred
Error while expanding policy
Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
Peter Qiu [Thu, 15 Oct 2015 04:08:50 +0000 (04:08 +0000)]
am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
7d3690eb3572477b65c04c7a7964a3367c2f69a6':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:00:38 +0000 (04:00 +0000)]
Merge "Export include path to D-Bus headers for multilib builds"
Ying Wang [Thu, 15 Oct 2015 01:15:34 +0000 (01:15 +0000)]
am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
84c5ae523201f17b94b5b0afe85a9af3f26c8231':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:10:44 +0000 (01:10 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
Peter Qiu [Wed, 14 Oct 2015 23:46:41 +0000 (16:46 -0700)]
Export include path to D-Bus headers for multilib builds
Bug:None
Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
Ying Wang [Wed, 14 Oct 2015 23:32:18 +0000 (23:32 +0000)]
am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
ed4b0eeb435903d9be502dcebd2c000f143df575':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
Ying Wang [Wed, 14 Oct 2015 23:08:53 +0000 (23:08 +0000)]
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit
16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.
Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
Steve Fung [Wed, 14 Oct 2015 22:54:51 +0000 (15:54 -0700)]
Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.
Bug:
24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
Ying Wang [Wed, 14 Oct 2015 21:47:50 +0000 (21:47 +0000)]
am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
3757268466d8fe9438e45e989728a74f14a162c6':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:43:41 +0000 (21:43 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Sami Tolvanen [Wed, 14 Oct 2015 20:53:28 +0000 (20:53 +0000)]
am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
f635a586e8f4790455ef3dad8c1291c9eb95747e':
Disable verity metadata for eng builds
Sami Tolvanen [Wed, 14 Oct 2015 20:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"
Ying Wang [Wed, 14 Oct 2015 20:45:49 +0000 (20:45 +0000)]
am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
191da9bc08360409fa2951567e427168a8d1f76d':
Let get-prebuilt-src-arch return empty if the input is empty
Ying Wang [Wed, 14 Oct 2015 20:41:30 +0000 (20:41 +0000)]
Merge "Let get-prebuilt-src-arch return empty if the input is empty"
Sami Tolvanen [Tue, 15 Sep 2015 16:21:15 +0000 (17:21 +0100)]
Disable verity metadata for eng builds
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit
beae6395fc934ae24955a5e96ec04cda5535d952)
Chih-Wei Huang [Sun, 4 Oct 2015 16:28:47 +0000 (00:28 +0800)]
Let get-prebuilt-src-arch return empty if the input is empty
The list of archs of a pure java apk (no native libs) is empty.
In this case get-prebuilt-src-arch still return 'none'.
If it's set to LOCAL_MODULE_TARGET_ARCH, it makes the apk
be incompatible with the building target. It's not good.
Just return empty in this case.
Change-Id: Ide75cdb08c8480c8e7d3a0ac59f41831fbc18bd5
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e
Ying Wang [Wed, 14 Oct 2015 01:05:41 +0000 (01:05 +0000)]
am
723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '
723a26530f801640e8fb9fe037a9f6ca9abe1f39':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:03:10 +0000 (01:03 +0000)]
Merge "Allow to build against Mac OS X SDK 10.11."
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Bug:
24898607
Change-Id: Ie2973d41b905637862616286663baf80df83bd88
Bertrand Simonnet [Tue, 13 Oct 2015 20:08:37 +0000 (20:08 +0000)]
am
f698ca63: Merge "Add the product version to target_files.zip."
* commit '
f698ca63d970e1ed7f9b5c4090d2cf5cfa659e55':
Add the product version to target_files.zip.
Bertrand Simonnet [Tue, 13 Oct 2015 19:59:42 +0000 (19:59 +0000)]
Merge "Add the product version to target_files.zip."
Neil Fuller [Tue, 13 Oct 2015 09:14:16 +0000 (09:14 +0000)]
am
9d14d317: Merge "Fix for Java 8 toolchain builds"
* commit '
9d14d317c8b0f128903db72bfb1cfda0f3468280':
Fix for Java 8 toolchain builds
Neil Fuller [Tue, 13 Oct 2015 08:26:16 +0000 (08:26 +0000)]
Merge "Fix for Java 8 toolchain builds"
Shinichiro Hamaji [Tue, 13 Oct 2015 05:39:04 +0000 (05:39 +0000)]
am
b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
* commit '
b7462534f23145b8413fdd631fe419d0e38b335a':
Stop passing --gen_all_phony_targets to kati
Shinichiro Hamaji [Tue, 13 Oct 2015 05:35:50 +0000 (05:35 +0000)]
Merge "Stop passing --gen_all_phony_targets to kati"
Dan Willemsen [Mon, 12 Oct 2015 23:28:41 +0000 (23:28 +0000)]
am
90ddd588: Merge "Add all-named-(dirs|files)-under and related"
* commit '
90ddd58826c65f3d8d8aad197d5dbd8e3036199c':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Mon, 12 Oct 2015 23:24:10 +0000 (23:24 +0000)]
Merge "Add all-named-(dirs|files)-under and related"
Dan Willemsen [Mon, 12 Oct 2015 22:26:52 +0000 (15:26 -0700)]
Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug:
24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
Neil Fuller [Mon, 12 Oct 2015 16:29:45 +0000 (17:29 +0100)]
Fix for Java 8 toolchain builds
We don't need to assume the OpenJDK (i.e. for Mac builds).
Change-Id: I1ac1856813045c7b1478dee6b08ad7b49300e4d7
Bertrand SIMONNET [Thu, 8 Oct 2015 22:32:40 +0000 (15:32 -0700)]
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
Dan Albert [Thu, 8 Oct 2015 21:16:39 +0000 (14:16 -0700)]
Use libgcov OR libclang_rt.profile, not both.
Using both can cause duplicate symbol errors.
Change-Id: Id8ee13a81d32e3248ff1cdc468f49a26ecde6b57
Bill Yi [Thu, 8 Oct 2015 17:34:18 +0000 (10:34 -0700)]
Yohann Roussel [Thu, 8 Oct 2015 08:46:45 +0000 (08:46 +0000)]
Merge "Ensure dump-words-to-file creates the target"
Chih-Wei Huang [Thu, 8 Oct 2015 07:07:23 +0000 (15:07 +0800)]
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
567ea28838678f1cea789538dbf79cd94db1f2d9)
Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
Shinichiro Hamaji [Thu, 8 Oct 2015 06:25:16 +0000 (15:25 +0900)]
Stop passing --gen_all_phony_targets to kati
https://github.com/google/kati/commit/
6ff74ce8ee4a618060a5bc7dac408be909151518
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
Yohann Roussel [Tue, 6 Oct 2015 13:28:38 +0000 (15:28 +0200)]
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
Zach Jang [Tue, 6 Oct 2015 01:33:27 +0000 (01:33 +0000)]
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
Zach Jang [Tue, 6 Oct 2015 01:26:51 +0000 (01:26 +0000)]
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
Zach Jang [Tue, 6 Oct 2015 01:21:03 +0000 (01:21 +0000)]
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
Zach Jang [Tue, 6 Oct 2015 01:01:12 +0000 (18:01 -0700)]
Reverting Android Security Patch Level string back to 2015-10-01
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
Brian Carlstrom [Sun, 4 Oct 2015 20:05:54 +0000 (20:05 +0000)]
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
Brian Carlstrom [Sun, 4 Oct 2015 20:00:56 +0000 (20:00 +0000)]
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
Brian Carlstrom [Sun, 4 Oct 2015 19:53:49 +0000 (19:53 +0000)]
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
Brian Carlstrom [Sun, 4 Oct 2015 19:47:22 +0000 (19:47 +0000)]
am
f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '
f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
Use $OUT_DIR/filelist when OUT_DIR is set
Brian Carlstrom [Sun, 4 Oct 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
Steve Fung [Sat, 3 Oct 2015 02:02:38 +0000 (02:02 +0000)]
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
Steve Fung [Sat, 3 Oct 2015 01:55:34 +0000 (01:55 +0000)]
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
Steve Fung [Sat, 3 Oct 2015 01:50:54 +0000 (01:50 +0000)]
Merge "Exclude OTA/bin tools when using A/B OTA updater"
Colin Cross [Sat, 3 Oct 2015 00:51:02 +0000 (00:51 +0000)]
am
d98fe91a: am
6b02b76a: Merge "Fix gcc color diagnostics"
* commit '
d98fe91a7524d40808ae4ed562aeb38e9eedf593':
Fix gcc color diagnostics
Colin Cross [Sat, 3 Oct 2015 00:43:23 +0000 (00:43 +0000)]
am
6b02b76a: Merge "Fix gcc color diagnostics"
* commit '
6b02b76ab9ebb5c21743abc5616379d19bc1c304':
Fix gcc color diagnostics
Steve Fung [Fri, 2 Oct 2015 06:53:31 +0000 (23:53 -0700)]
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
Colin Cross [Fri, 2 Oct 2015 23:52:58 +0000 (23:52 +0000)]
Merge "Fix gcc color diagnostics"
Colin Cross [Fri, 2 Oct 2015 22:17:47 +0000 (15:17 -0700)]
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
Colin Cross [Fri, 2 Oct 2015 18:08:41 +0000 (18:08 +0000)]
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
Colin Cross [Fri, 2 Oct 2015 18:04:18 +0000 (18:04 +0000)]
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
Colin Cross [Fri, 2 Oct 2015 17:58:20 +0000 (17:58 +0000)]
Merge "Move the dist-as-droid handling from make to ninja"
Alex Deymo [Fri, 2 Oct 2015 03:52:50 +0000 (03:52 +0000)]
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.
Alex Deymo [Fri, 2 Oct 2015 03:46:07 +0000 (03:46 +0000)]
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.
Alex Deymo [Fri, 2 Oct 2015 03:40:47 +0000 (03:40 +0000)]
Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
Alex Deymo [Fri, 2 Oct 2015 00:38:09 +0000 (17:38 -0700)]
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
Colin Cross [Thu, 1 Oct 2015 22:59:56 +0000 (22:59 +0000)]
am
f17f8b49: am
6ec320df: Merge "Have all targets in build.ninja"
* commit '
f17f8b49c92d5a10537cc28f29039e07b1ec17a5':
Have all targets in build.ninja
Colin Cross [Thu, 1 Oct 2015 22:11:27 +0000 (22:11 +0000)]
am
6ec320df: Merge "Have all targets in build.ninja"
* commit '
6ec320df174b6f1dd17023e20fc642f89bb83b4c':
Have all targets in build.ninja
Colin Cross [Thu, 1 Oct 2015 21:13:03 +0000 (21:13 +0000)]
Merge "Have all targets in build.ninja"
Kenny Root [Thu, 1 Oct 2015 18:10:46 +0000 (18:10 +0000)]
am
c58e9de8: am
9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '
c58e9de8078aedc7b290e15d14ef436860909d55':
Remove old grandfathered ALL_PREBUILTS
Kenny Root [Thu, 1 Oct 2015 18:05:48 +0000 (18:05 +0000)]
am
9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '
9df1cb507d4d3442c75ca083670bf06938c7d66e':
Remove old grandfathered ALL_PREBUILTS
Kenny Root [Thu, 1 Oct 2015 17:55:05 +0000 (17:55 +0000)]
Merge "Remove old grandfathered ALL_PREBUILTS"
Claes Elgemark [Thu, 1 Oct 2015 14:12:48 +0000 (14:12 +0000)]
am
8d7715ed: am
1b045b3d: am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
8d7715ed44b4af7d3c6cdb8828616c10e33fb612':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Thu, 1 Oct 2015 14:07:49 +0000 (14:07 +0000)]
am
1b045b3d: am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
1b045b3d66fb18ecf7deec31dd4fd33993f5ae83':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Thu, 1 Oct 2015 14:03:40 +0000 (14:03 +0000)]
am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
5b08efb73f1b114f6dfdb52284738f7210d0cf7e':
Don't fail build of otatools if there are no device certificates
Stephen Hines [Thu, 1 Oct 2015 05:38:06 +0000 (05:38 +0000)]
am
ba2355c9: resolved conflicts for
9073a5d9 to stage-aosp-master
* commit '
ba2355c9810ad3113e0705d106b28d9cdcbee759':
Fix RS NDK usage so we always pull from "current" instead of NDK 8.
Stephen Hines [Thu, 1 Oct 2015 05:32:05 +0000 (22:32 -0700)]
resolved conflicts for
9073a5d9 to stage-aosp-master
Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3
Stephen Hines [Thu, 1 Oct 2015 05:19:50 +0000 (05:19 +0000)]
Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."
Brian Carlstrom [Thu, 1 Oct 2015 03:28:54 +0000 (20:28 -0700)]
Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
Tao Bao [Thu, 1 Oct 2015 00:00:06 +0000 (00:00 +0000)]
am
ce9635ec: am
2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit '
ce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff':
Only use a fixed timestamp when packaging.
Dan Willemsen [Wed, 30 Sep 2015 23:59:46 +0000 (23:59 +0000)]
am
05bb4fed: am
edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit '
05bb4fed0d0e701ba13fef5f20b57eb1642cc40a':
Sort more instances of wildcard and find
Dan Willemsen [Wed, 30 Sep 2015 23:59:45 +0000 (23:59 +0000)]
am
24b5fcf9: am
604e532f: Merge "Add all-cpp-files-under"
* commit '
24b5fcf92aeba5a17bf0b4d1720318602cf51a16':
Add all-cpp-files-under
Tao Bao [Wed, 30 Sep 2015 23:50:49 +0000 (23:50 +0000)]
am
2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit '
2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6':
Only use a fixed timestamp when packaging.