OSDN Git Service
Chih-hung Hsieh [Fri, 23 Oct 2015 00:26:20 +0000 (00:26 +0000)]
Merge "Move x86_64 target to clang by default."
Chih-Hung Hsieh [Thu, 22 Oct 2015 23:29:59 +0000 (16:29 -0700)]
Move x86_64 target to clang by default.
Bug:
23163853
Change-Id: I0587ec75c0000ac99562233de33147ec8e120e65
Mike Frysinger [Thu, 22 Oct 2015 19:40:43 +0000 (19:40 +0000)]
Merge "use `find -exec ... +` everywhere"
Tao Bao [Thu, 22 Oct 2015 18:57:42 +0000 (18:57 +0000)]
Merge "Fix calculation of stashed blocks."
Tao Bao [Thu, 22 Oct 2015 18:09:27 +0000 (18:09 +0000)]
Merge "blockimgdiff.py: Fix the script error for BBOTA v1."
Mike Frysinger [Tue, 22 Sep 2015 22:13:48 +0000 (18:13 -0400)]
use `find -exec ... +` everywhere
This is more efficient as find itself can handle correctly passing
arguments down to the command, and this is in POSIX. The current
versions of OS X also support this form.
BUG=None
TEST=mgrep still works
Change-Id: Ie570867609113868daaf068658c4f7e6f4ae42fa
Yohann Roussel [Thu, 22 Oct 2015 10:46:37 +0000 (10:46 +0000)]
Merge changes from topic 'jack-server-1.3-a3'
* changes:
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
caozhiyuan [Wed, 21 Oct 2015 07:14:03 +0000 (15:14 +0800)]
Fix calculation of stashed blocks.
Change-Id: Ic3d607cb6691fc58e189a54a7244942cf3f3c387
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
Tao Bao [Wed, 21 Oct 2015 20:36:01 +0000 (13:36 -0700)]
blockimgdiff.py: Fix the script error for BBOTA v1.
CL in [1] added an assertion to make sure an empty RangeSet cannot call
RangeSet.to_raw_string(). However, we may unintentionally hit that when
generating BBOTA v1 script (e.g. for "new" commands that always have
empty src_ranges).
[1] commit
e8f756137c39fc3292014f2eab5f84c6e5135797
Change-Id: I1723606967f354ace9286d2b888fdbc80ba10e39
Nick Kralevich [Wed, 21 Oct 2015 18:10:53 +0000 (18:10 +0000)]
Merge "allow qemu_props to set opengles.version"
Nick Kralevich [Wed, 21 Oct 2015 17:55:21 +0000 (10:55 -0700)]
allow qemu_props to set opengles.version
Addresses the following denial:
init: avc: denied { set } for property=opengles.version scontext=u:r:qemu_props:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
Bug:
25148690
Change-Id: I4b197eeabfe37e794104e4e686e9e388b5bc3e0c
Stephen Hines [Wed, 21 Oct 2015 16:29:28 +0000 (16:29 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
Stephen Hines [Wed, 21 Oct 2015 15:32:45 +0000 (08:32 -0700)]
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
This reverts commit
1332828b6ea25250c497609a1d4b2c7e28227ff9.
Bug:
25141123
Change-Id: Idd5d8757095b2b370046a84aea76bc95e16f3876
Yohann Roussel [Mon, 12 Oct 2015 16:02:51 +0000 (18:02 +0200)]
Remove LOCAL_JACK_EXTRA_ARGS
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.
(cherry picked from commit
d2b2983cc791f90a0d052699603723335ab94f5a)
Change-Id: I1cd76836792e7332bc3750408a860400b0957485
Yohann Roussel [Fri, 3 Jul 2015 13:46:51 +0000 (15:46 +0200)]
Allow control of jack used for compilation
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools
Bug:
24564814
(cherry picked from commit
b68c9a498d1e2c631eb6e8c9092d4d5775402083)
Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
Yohann Roussel [Thu, 2 Jul 2015 10:10:17 +0000 (12:10 +0200)]
Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
(cherry picked from commit
5e50b342218fe2b9c1af20fd7da3c173bfac0499)
Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
Stephen Hines [Wed, 21 Oct 2015 00:18:05 +0000 (00:18 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
Colin Cross [Wed, 21 Oct 2015 00:15:33 +0000 (00:15 +0000)]
Merge changes I2ba90314,I5f47307d
* changes:
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Colin Cross [Tue, 20 Oct 2015 22:41:05 +0000 (15:41 -0700)]
makeparallel: prepend flags to ninja command line
Ninja stops parsing top level options after -t is used to select a
tool. Put any inserted command line options at the beginning of the
command.
Change-Id: I2ba903143366aaded63e21d749476248617c8962
Andreas Gampe [Tue, 20 Oct 2015 23:37:36 +0000 (23:37 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
Colin Cross [Mon, 5 Oct 2015 22:12:08 +0000 (15:12 -0700)]
Put NINJA_ARGS last
Put NINJA_ARGS at the end of the command line so it can contain tools,
which expect to be last.
Change-Id: I5f47307d01aa52eb74a333b19ffe3a7cd8950b01
Roland Levillain [Tue, 20 Oct 2015 21:30:10 +0000 (21:30 +0000)]
Merge "Typos in envsetup.sh."
Dan Willemsen [Tue, 20 Oct 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Stop encoding absolute paths in symbols"
Chih-hung Hsieh [Tue, 20 Oct 2015 19:47:55 +0000 (19:47 +0000)]
Merge "Move x86 target to clang by default."
Chih-Hung Hsieh [Tue, 20 Oct 2015 19:16:57 +0000 (12:16 -0700)]
Move x86 target to clang by default.
Bug:
23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
Roland Levillain [Tue, 20 Oct 2015 11:48:19 +0000 (12:48 +0100)]
Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
Andreas Gampe [Fri, 16 Oct 2015 03:43:29 +0000 (20:43 -0700)]
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
The secondary variant fallback was not set. The build system expects
the variants, so system properties were malformed for x86-64:
[dalvik.vm.isa.x86.variant]: [dalvik.vm.isa.x86.features=default]
Bug:
24989387
Change-Id: Idbf54f81494f2650ad56080305807fd6b7ed4161
Christopher Wiley [Mon, 19 Oct 2015 23:44:21 +0000 (23:44 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
Christopher Wiley [Thu, 15 Oct 2015 00:27:24 +0000 (17:27 -0700)]
Invoke the aidl-cpp compiler to generate C++
Bug:
23599697
Test: test application compiles generated code
Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
Ying Wang [Mon, 19 Oct 2015 22:44:03 +0000 (22:44 +0000)]
Merge "envsetup: Show error when supplied dir isn't present with mmm"
Dan Willemsen [Mon, 19 Oct 2015 21:21:40 +0000 (21:21 +0000)]
Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
Abhinav1997 [Sun, 18 Oct 2015 18:25:48 +0000 (20:25 +0200)]
envsetup: Show error when supplied dir isn't present with mmm
When a directory isn't present with mmm, don't show "No Android.mk present", rather show that the directory isn't present
Change-Id: I7259a60012c6f30c470daa60d5a5097d01ffc4c7
Signed-off-by: Abhinav1997 <abhinav.jhanwar.august2@gmail.com>
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "Error correction: Append codes to verified partitions"
Ying Wang [Sun, 18 Oct 2015 17:07:28 +0000 (17:07 +0000)]
Merge "If a console doesn't exist, read password from stdin."
Colin Cross [Tue, 30 Jun 2015 19:21:59 +0000 (12:21 -0700)]
Add support for LOCAL_SRC_FILES_EXCLUDE
LOCAL_SRC_FILES_EXCLUDE will be used to filter files out of
LOCAL_SRC_FILES. A common usage will be to use
LOCAL_SRC_FILES_EXCLUDE_<arch> to remove a source file that will be
replaced with an arch-optimized version.
Change-Id: I75cc6114c47fb784bab65cae8f618c4f395f07bb
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:42:34 +0000 (21:42 +0000)]
Merge "Pass source's info_dict to vendor's releasetools.py."
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: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:13:41 +0000 (18:13 +0000)]
Merge "Add the Product ID to target_files.zip"
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:00:38 +0000 (04:00 +0000)]
Merge "Export include path to D-Bus headers for multilib builds"
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
Dan Willemsen [Wed, 14 Oct 2015 23:44:53 +0000 (16:44 -0700)]
Stop encoding absolute paths in symbols
GCC & Clang encode the current working directory into the symbol files.
Even if the binaries are stripped before being installed, the build-id
hash will be different. This means that two different checkouts will
produce different installed binaries, even if the sources are identical.
To prevent this, set PWD=/proc/self/cwd, so that it replaces the
absolute path with the static path /proc/self/cwd. With GCC, use
-fdebug-prefix-map to remove that static path. Our clang does not yet
support this flag, but it was merged in r250094.
This does change the behavior when using gdb -- you now need to be in
$ANDROID_BUILD_TOP before gdb will load the sources.
Bug:
24204119
Change-Id: I792d65b042b7a3fdc78d567c5a6e93cdf0141b9b
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: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: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:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"
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 [Wed, 20 May 2015 06:30:57 +0000 (07:30 +0100)]
Error correction: Append codes to verified partitions
Append error-correcting codes to verified partitions provided that
PRODUCT_SUPPORTS_VERITY_FEC is true.
This moves verity metadata to be after the hash tree, and requires
matching changes from
Ide48f581bbba77aed6132f77b309db71630d81ed
Bug:
21893453
Change-Id: I6945cbab99e214566a1f9d3702333f2dbbc35816
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: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 19:59:42 +0000 (19:59 +0000)]
Merge "Add the product version to target_files.zip."
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:35:50 +0000 (05:35 +0000)]
Merge "Stop passing --gen_all_phony_targets to kati"
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
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
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: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: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: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: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: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"
Stephen Hines [Tue, 29 Sep 2015 03:33:03 +0000 (20:33 -0700)]
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
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."
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.
Tao Bao [Wed, 30 Sep 2015 23:45:45 +0000 (23:45 +0000)]
Merge "Only use a fixed timestamp when packaging."
Dan Willemsen [Wed, 30 Sep 2015 23:44:10 +0000 (23:44 +0000)]
am
edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit '
edc3e6cd6a0d6af4df3d6f07f40de17980b66ad0':
Sort more instances of wildcard and find
Dan Willemsen [Wed, 30 Sep 2015 23:44:01 +0000 (23:44 +0000)]
am
604e532f: Merge "Add all-cpp-files-under"
* commit '
604e532f842fa38982eb47708e3afb5415ba4b72':
Add all-cpp-files-under
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
Only use a fixed timestamp when packaging.
[1] changed to use a fixed timestamp for all the generated images
(either the one under $ANDROID_PRODUCT_OUT/ or the one added into the
target_files zip). It makes 'adb sync' after 'fastboot flashall' to
resync all the files. This CL changes to use a fixed timestamp only when
packaging into the target_files zip.
[1]: commit
052ae3542be93d30108e742c5c21d5c45d9b7cf8
Bug:
24377993
Bug:
24536411
Change-Id: I209318966109fd4902468dfe96caf777464f9fe1
Colin Cross [Wed, 30 Sep 2015 22:41:51 +0000 (15:41 -0700)]
Have all targets in build.ninja
We should pass --gen_all_targets to have targets which are not declared
as .PHONY. However, this triggers some nasty behavior inherited from
make, where targets can get variables from things that depend on them.
--gen_all_targets will traverse the targets starting at random points in
the dependency tree, and any variables set higher in the tree will not
be visible. To work around this, keep --gen_all_phony_targets, which
will start traversing at the phony targets first. This will enter the
tree traversal at points we know don't use inherited variables, like
checkbuild or the PARSE_TIME_MAKE_GOALS, and will reach all the
dependencies that use inherited variables in the right order.
--gen_all_targets will then fill in any remaining targets that were not
in the main dependency tree, and hopefully none of them use any
inherited variables.
Bug:
24384320
Change-Id: I1ff07b7ef26e9481baae678e7fe0933b6d05f2a7
Dan Willemsen [Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Sort more instances of wildcard and find"