OSDN Git Service
Chih-Hung Hsieh [Wed, 17 Aug 2016 17:48:56 +0000 (17:48 +0000)]
Merge "Clarify default tidy check lists."
am:
ce4c49c2f2
Change-Id: If0641d286d6f1fefa871a18c21282f4fcd10d8a1
Dan Willemsen [Wed, 17 Aug 2016 17:48:54 +0000 (17:48 +0000)]
Merge "Support dist-ing the userdatatarball"
am:
9abbeb3d8f
Change-Id: I0dac58c2eed164247fe595da6897ff00f0786e18
Chih-Hung Hsieh [Wed, 17 Aug 2016 17:48:52 +0000 (17:48 +0000)]
Merge "Remove spaces in tidy check list."
am:
e7bca12466
Change-Id: I852d42992bc1ddb0a17dd1dcf03cf25f1d114552
Treehugger Robot [Wed, 17 Aug 2016 04:56:07 +0000 (04:56 +0000)]
Merge "Clarify default tidy check lists."
Dan Willemsen [Wed, 17 Aug 2016 00:58:18 +0000 (00:58 +0000)]
Merge "Support dist-ing the userdatatarball"
Treehugger Robot [Wed, 17 Aug 2016 00:44:50 +0000 (00:44 +0000)]
Merge "Remove spaces in tidy check list."
Dan Willemsen [Tue, 16 Aug 2016 23:36:05 +0000 (16:36 -0700)]
Support dist-ing the userdatatarball
So that we can get to the contents of userdata from the build server
without extracting the image.
Bug:
27719200
Test: m userdatatarball dist
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
Chih-Hung Hsieh [Tue, 16 Aug 2016 23:27:30 +0000 (16:27 -0700)]
Remove spaces in tidy check list.
This will allow spaces in LOCAL_TIDY_CHECKS.
Bug: http://b/
27779618
Change-Id: I6f9b133220e49b2581a06d2fd9083a1d6b7badca
Test: build with WITH_TIDY=1.
Chih-Hung Hsieh [Tue, 16 Aug 2016 20:42:06 +0000 (13:42 -0700)]
Clarify default tidy check lists.
* Sort all enabled and disabled checks.
* Disable google-default-arguments for external and vendor projects.
Bug: http://b/
27779618
Change-Id: I59e6eaf84fddf54bd89eb71a2189d73b64968057
Test: build with WITH_TIDY=1.
Dan Willemsen [Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"
am:
6b9aa6938d
Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
Dan Willemsen [Mon, 15 Aug 2016 21:07:53 +0000 (21:07 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"
Tianjie Xu [Fri, 12 Aug 2016 18:06:41 +0000 (18:06 +0000)]
Merge "Replace META/care_map.txt when signing target files"
am:
7b11cacbba
Change-Id: Ia8e888a0f330d00f6518e352356ca480819586db
Tianjie Xu [Fri, 12 Aug 2016 18:01:55 +0000 (18:01 +0000)]
Merge "Replace META/care_map.txt when signing target files"
Dan Willemsen [Fri, 12 Aug 2016 00:20:33 +0000 (17:20 -0700)]
Fix GET-INSTALL-PATH to work with Soong
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.
Bug:
30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
Tianjie Xu [Fri, 12 Aug 2016 01:04:27 +0000 (18:04 -0700)]
Replace META/care_map.txt when signing target files
Do not copy the "META/care_map.txt" from the source zipfile when
signing the target files with sign_target_files_apks. Because we'll
generate a new care_map after rebuilding the system/vendor images;
and we'll write the new "META/care_map.txt" to the signed-target-file.
Change-Id: I6919cfdf8314a4084b5f612a9c89469f391486a4
Test: Run sign_target_files_apks locally, and the entry is updated.
Bug:
30812253
Colin Cross [Fri, 12 Aug 2016 00:04:38 +0000 (00:04 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
am:
0d86fc57cd
Change-Id: Ib643a2d9682eabd494f40a0d5b7fbaeb42583d30
Colin Cross [Thu, 11 Aug 2016 23:53:29 +0000 (23:53 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
Tao Bao [Thu, 11 Aug 2016 20:42:34 +0000 (20:42 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."
am:
6d64ff1bf7
Change-Id: I1deeff5d22454c1fae5b450dbf2e6a35ffbc6227
Tao Bao [Thu, 11 Aug 2016 20:39:31 +0000 (20:39 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."
Dan Willemsen [Thu, 11 Aug 2016 19:33:10 +0000 (19:33 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"
am:
6dcdb45485
Change-Id: I9a4241b436f7dead5de7b02d3af56004b1eed42f
Treehugger Robot [Thu, 11 Aug 2016 19:28:13 +0000 (19:28 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"
Tao Bao [Thu, 11 Aug 2016 18:00:58 +0000 (11:00 -0700)]
releasetools: Update the path to /default.prop for A/B devices.
On A/B devices (i.e. system_root_image="true"), /default.prop is
packaged at ROOT/default.prop (as opposed to BOOT/RAMDISK/default.prop
for non-A/B devices). Update the path so that we handle properties like
ro.bootimage.build.fingerprint properly.
The one for recovery is not affected, which stays at
BOOT/RAMDISK/default.prop for A/B devices and gets updated correctly.
Bug:
30811237
Test: Verify the property in the generated signed-TF.zip.
Change-Id: Id201a042d7ea988a64f89c6d04f43326a9851e27
Dan Albert [Thu, 11 Aug 2016 16:52:52 +0000 (16:52 +0000)]
Merge "Add support for NDK r13."
am:
287093a98c
Change-Id: I8e10422cdd20d3ee0402acabbdbe60a41ba59901
Dan Albert [Thu, 11 Aug 2016 16:46:34 +0000 (16:46 +0000)]
Merge "Add support for NDK r13."
Dan Willemsen [Sun, 7 Aug 2016 03:15:06 +0000 (20:15 -0700)]
Use soong_zip and zip2zip to make dist faster
soong_zip parallelizes the compression when creating a zip file, which
makes these packaging steps far shorter.
zip2zip skips the decompression and recompression during the -img- file
creation.
For an aosp_arm64-eng aosp/master build:
target_files.zip: 92s to 60s
symbols.zip: 147s to 7s
img.zip: 64s to 0.5s
There's still room to parallelize the image compression during
target_files.zip (add_img_to_target_files step takes most of the time)
Change-Id: I7b6a91e4a7dbeda2e49ca936b10181cff2f973d7
Dan Albert [Tue, 9 Aug 2016 00:14:59 +0000 (17:14 -0700)]
Add support for NDK r13.
Test: make checkbuild
Change-Id: I4521c768c67771cee9df9e59ed45344c40c48a38
Alex Deymo [Wed, 10 Aug 2016 05:00:57 +0000 (05:00 +0000)]
Merge changes from topic 'ab_sideload'
am:
3750ed3e17
Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05
Alex Deymo [Wed, 10 Aug 2016 03:55:24 +0000 (03:55 +0000)]
Merge changes from topic 'ab_sideload'
* changes:
Replace OTA sideload verification key when signing A/B devices.
Install the update-payload-key in the recovery image as well.
Dan Albert [Tue, 9 Aug 2016 01:39:43 +0000 (01:39 +0000)]
Merge "Account for `LOCAL_NDK_VERSION` when packaging."
am:
a1374de305
Change-Id: I37d554e931ef125a888ffc2bdf6e6e2f031d89e1
Treehugger Robot [Tue, 9 Aug 2016 01:36:23 +0000 (01:36 +0000)]
Merge "Account for `LOCAL_NDK_VERSION` when packaging."
Dan Albert [Tue, 9 Aug 2016 00:13:31 +0000 (17:13 -0700)]
Account for `LOCAL_NDK_VERSION` when packaging.
Previously an app built with `LOCAL_NDK_VERSION := r10` would still
be packaged with r11's library.
Test: make checkbuild
Change-Id: I1dcbd65057adaa1af605b9770283f7da994fc3cf
Chih-hung Hsieh [Mon, 8 Aug 2016 23:37:35 +0000 (23:37 +0000)]
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
am:
4d9d191ee7
Change-Id: I28ec175909e7993f84089846c7c25f516aa1bf02
Chih-hung Hsieh [Mon, 8 Aug 2016 23:22:13 +0000 (23:22 +0000)]
Merge "Simplify DEFAULT_LOCAL_TIDY_CHECKS."
Chih-Hung Hsieh [Mon, 8 Aug 2016 22:01:59 +0000 (15:01 -0700)]
Simplify DEFAULT_LOCAL_TIDY_CHECKS.
* Now each local directory path is matched against multiple
patterns and only the last matched one will be used,
or the DEFAULT_GLOBAL_TIDY_CHECKS is used.
Bug: http://b/
27779618
Change-Id: I786e6cacd8a680a034b4bc09f561f658177d9b17
Test: build with WITH_TIDY=1.
Alex Naidis [Sun, 7 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "core: Makefile: fix a typo in a comment"
am:
80ad0df403
Change-Id: Id0fce6adadada6d80cca5b08b1e61f0e7a88a01c
Treehugger Robot [Sun, 7 Aug 2016 16:01:06 +0000 (16:01 +0000)]
Merge "core: Makefile: fix a typo in a comment"
Alex Naidis [Sun, 10 Jan 2016 14:18:54 +0000 (14:18 +0000)]
core: Makefile: fix a typo in a comment
Change-Id: I1a8f1a4e2d7d29fa930fd0a07f4885c162f3e1f4
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Dan Albert [Sat, 6 Aug 2016 01:18:58 +0000 (01:18 +0000)]
Merge "Define __ANDROID_API__ when building for the NDK."
am:
30fe7576d0
Change-Id: I4aa349b7293db5e9e7214cdb10a682164214de60
Treehugger Robot [Sat, 6 Aug 2016 00:52:33 +0000 (00:52 +0000)]
Merge "Define __ANDROID_API__ when building for the NDK."
Dan Albert [Fri, 5 Aug 2016 23:34:40 +0000 (16:34 -0700)]
Define __ANDROID_API__ when building for the NDK.
Traditionally this has come from android/api-level.h, but with the
libc headers unified it must be set by the build system since we don't
have per-API level copies of that header now.
Test: make checkbuild with other libc ndk_library patches
Change-Id: Idf6cbba131f065b048b1b412e992c55e3d17e701
Dan Albert [Fri, 5 Aug 2016 22:35:11 +0000 (22:35 +0000)]
Merge "More NDK generated libs support."
am:
bd9fb4ba01
Change-Id: I46e77781702a68bea56691245e04387fc2845b56
Chih-Hung Hsieh [Fri, 5 Aug 2016 22:35:10 +0000 (22:35 +0000)]
Merge "Make it an error when LOCAL_CLANG is false."
am:
9204b776bb
Change-Id: I7e2e674eb6f79ec7180f801dd12378842b239512
Treehugger Robot [Fri, 5 Aug 2016 22:32:12 +0000 (22:32 +0000)]
Merge "More NDK generated libs support."
Chih-hung Hsieh [Fri, 5 Aug 2016 22:25:43 +0000 (22:25 +0000)]
Merge "Make it an error when LOCAL_CLANG is false."
Chih-Hung Hsieh [Thu, 4 Aug 2016 22:35:51 +0000 (15:35 -0700)]
Make it an error when LOCAL_CLANG is false.
Only projects in LOCAL_CLANG_EXCEPTION_PROJECTS can set LOCAL_CLANG to false.
Add external/gentoo/integration to this white list.
Bug:
30575506
Change-Id: Icd508686bc2eb8b9d400200166df80115af20da1
Test: build and find new warning in build.log
Alex Deymo [Thu, 4 Aug 2016 23:06:12 +0000 (16:06 -0700)]
Replace OTA sideload verification key when signing A/B devices.
The update-payload-key is used by update_engine_sideload from recovery
to verify an update payload.
Bug:
27178350
Change-Id: I7a0a307ae565e5e9cbf2c9b58fbcc055e87771ce
Dan Albert [Thu, 4 Aug 2016 21:14:50 +0000 (14:14 -0700)]
More NDK generated libs support.
Any NDK shared libraries not in LOCAL_SYSTEM_SHARED_LIBRARIES weren't
being pulled from the generated libs before since we were only
filtering my_system_shared_libraries and even if we had filtered
my_shared_libraries they would have been rewritten to my_ldlibs.
* Filter my_shared_libraries for NDK generated libs as well.
* Stop rewriting NDK LOCAL_SHARED_LIBRARIES to my_ldlibs. Instead,
rewrite in the opposite direction just like we do for the platform.
* Move shared libs/ldlibs rewriting to before we filter NDK
libraries out of shared libs/system shared libs.
Test: make checkbuild
Bug: http://b/
27533932
Change-Id: If1860d9638de77089a46884f406766edaf362216
Alex Deymo [Thu, 4 Aug 2016 03:52:54 +0000 (20:52 -0700)]
Install the update-payload-key in the recovery image as well.
The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.
Bug:
27178350
TEST=`make` builds a boot.img with the payload key in recovery.
Change-Id: I04616979023b84aa4a1feb6916db2b2725b25c54
Chih-Hung Hsieh [Wed, 3 Aug 2016 20:24:22 +0000 (20:24 +0000)]
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
am:
6b5e8f0037
Change-Id: I0b2e7ca9d6aa1feeb5c4edadc565e0bca292625d
Treehugger Robot [Wed, 3 Aug 2016 20:04:20 +0000 (20:04 +0000)]
Merge "Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS."
Chih-Hung Hsieh [Wed, 3 Aug 2016 19:02:16 +0000 (19:02 +0000)]
Merge "Allow some bionic tests to compile with gcc."
am:
85e94f076c
Change-Id: Ic272be5c1ac460d5bda8373b8790829b43ef8257
Chih-Hung Hsieh [Wed, 3 Aug 2016 18:39:02 +0000 (11:39 -0700)]
Allow late binding of LOCAL_CLANG_EXCEPTION_PROJECTS.
* INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS is defined later in other config.mk.
Bug:
30575506
Test: build and find new warning in build.log
Change-Id: If5341a856d1792add38c80a15b8deae39f156138
Treehugger Robot [Wed, 3 Aug 2016 18:55:16 +0000 (18:55 +0000)]
Merge "Allow some bionic tests to compile with gcc."
Chih-Hung Hsieh [Wed, 3 Aug 2016 17:42:10 +0000 (10:42 -0700)]
Allow some bionic tests to compile with gcc.
bionic/tests has some test cases compiled with both gcc and clang.
Bug:
30575506
Change-Id: I68576a931021089ecc6b9c9d14ef0b3e3cf05e2d
Test: build and find new warning in build.log
Chih-Hung Hsieh [Wed, 3 Aug 2016 16:50:52 +0000 (16:50 +0000)]
Merge "Issue warning on projects with LOCAL_CLANG set to false."
am:
e71cdfbdee
Change-Id: Icb5708eb58f3c8e54b60538377b6afba5eb04de5
Chih-hung Hsieh [Wed, 3 Aug 2016 16:42:26 +0000 (16:42 +0000)]
Merge "Issue warning on projects with LOCAL_CLANG set to false."
Chih-Hung Hsieh [Tue, 2 Aug 2016 21:22:06 +0000 (14:22 -0700)]
Issue warning on projects with LOCAL_CLANG set to false.
* LOCAL_CLANG_EXCEPTION_PROJECTS is the list of project prefixes.
* New warning message is detected by warn.py as high severity.
Bug:
30575506
Change-Id: I87a38b2ba6bab1d2e5e7a9d5ec9557f0e609727c
Test: build and find new warning in build.log
Alexey Polyudov [Tue, 2 Aug 2016 22:50:21 +0000 (22:50 +0000)]
Merge "introduce AUX build class of targets"
am:
556526bf95
Change-Id: I52b4b3a561ceb9c1fbe71ce75a4ef4aa252a9665
Alexey Polyudov [Tue, 2 Aug 2016 22:37:02 +0000 (22:37 +0000)]
Merge "introduce AUX build class of targets"
Alexey Polyudov [Tue, 2 Aug 2016 22:17:26 +0000 (22:17 +0000)]
Merge "report correct build target class"
am:
974f750661
Change-Id: Idad227e2ac7e5b871d2831d6ca17933129e4ce4f
Alexey Polyudov [Tue, 2 Aug 2016 22:17:24 +0000 (22:17 +0000)]
Merge "Make linking with libcompiler_rt conditional"
am:
340c0c5701
Change-Id: Ide7cf834a0d981671f517366f7308c58d2a79163
Alexey Polyudov [Tue, 2 Aug 2016 22:17:23 +0000 (22:17 +0000)]
Merge "Do not assume CLANG is used when custom toolchain is provided"
am:
7a16eb05cc
Change-Id: Ib77cdcc52aae822235577c02ea1045e6b6de4096
Alexey Polyudov [Tue, 2 Aug 2016 22:17:21 +0000 (22:17 +0000)]
Merge "Add LOCAL_NO_PIC to disable position-independent code"
am:
ce5900a6e0
Change-Id: I471cff0f6c3479f9d34ee82b69c0be742304f70a
Alexey Polyudov [Tue, 2 Aug 2016 22:03:59 +0000 (22:03 +0000)]
Merge "report correct build target class"
Alexey Polyudov [Tue, 2 Aug 2016 22:03:48 +0000 (22:03 +0000)]
Merge "Make linking with libcompiler_rt conditional"
Alexey Polyudov [Tue, 2 Aug 2016 22:03:37 +0000 (22:03 +0000)]
Merge "Do not assume CLANG is used when custom toolchain is provided"
Alexey Polyudov [Tue, 2 Aug 2016 22:03:19 +0000 (22:03 +0000)]
Merge "Add LOCAL_NO_PIC to disable position-independent code"
Alexey Polyudov [Tue, 2 Aug 2016 00:41:49 +0000 (17:41 -0700)]
introduce AUX build class of targets
AUX is a new class, similar to TARGET
While TARGET defines toolchain for Application Processors
AUX is defining toolchains for arbitrary utility cores (DSPs, GPUs,
MCUs, etc). This allows building of non-android sources as part
of Android tree and avoid using prebuilts if source code is avaliable
Bug:
29635686
Change-Id: Ie755ea054b16c3e86369f5fb2ba6eb0b384af77f
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Alexey Polyudov [Fri, 24 Jun 2016 18:13:34 +0000 (11:13 -0700)]
report correct build target class
Use PRIVATE_PREFIX to tell us what is the target class
Bug:
29635686
Change-Id: Ia895e780f741b9cb00c7ee9633055b5363e675a1
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Alexey Polyudov [Tue, 2 Aug 2016 00:38:35 +0000 (17:38 -0700)]
Make linking with libcompiler_rt conditional
introduce LOCAL_NO_LIBCOMPILER_RT
embedded targets do not necessarily want to have it
Bug:
29635686
Change-Id: Ieb04f7ea7237ae01a067dedfa2fb13571e9a789c
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Alexey Polyudov [Fri, 24 Jun 2016 18:22:51 +0000 (11:22 -0700)]
Do not assume CLANG is used when custom toolchain is provided
When overriding toolchain with LOCAL_CC, LOCAL_CXX
build system shall not assume that this custom toolchain
is CLANG.
Bug:
29635686
Change-Id: I9712d098216740c4ff20bd2a4749f489af85b50e
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Alexey Polyudov [Tue, 2 Aug 2016 00:36:39 +0000 (17:36 -0700)]
Add LOCAL_NO_PIC to disable position-independent code
on some toolchains and architectures building non-PIC
code renders more efficient assembly
Bug:
29635686
Change-Id: I6274f40d24e1bb43f03b45c60b5487abed02b7fc
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Dan Willemsen [Mon, 1 Aug 2016 23:25:29 +0000 (23:25 +0000)]
Merge changes I9c735fe2,Ib918b2ed
am:
b51df6d171
Change-Id: I8b96c237e92fe3c8f4c8e74c2054ea2ed0ff2e45
Treehugger Robot [Mon, 1 Aug 2016 23:07:52 +0000 (23:07 +0000)]
Merge changes I9c735fe2,Ib918b2ed
* changes:
Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
Disable auto installclean for AAPT config change
Chih-Hung Hsieh [Mon, 1 Aug 2016 21:13:54 +0000 (21:13 +0000)]
Merge "Fix clang-tidy performance warnings."
am:
240faf5ef0
Change-Id: I161e035f9ef297635baa8cd97bbc9860e5852b5c
Treehugger Robot [Mon, 1 Aug 2016 21:04:20 +0000 (21:04 +0000)]
Merge "Fix clang-tidy performance warnings."
Narayan Kamath [Mon, 1 Aug 2016 12:29:17 +0000 (12:29 +0000)]
Merge \"Update package whitelist to track changes to java.lang.invoke.\"
am:
8ce8f60a2f
Change-Id: I61e7aa74c70675f676638dae867f3f18eebe75b3
Treehugger Robot [Mon, 1 Aug 2016 12:25:04 +0000 (12:25 +0000)]
Merge "Update package whitelist to track changes to java.lang.invoke."
Narayan Kamath [Wed, 27 Jul 2016 12:53:24 +0000 (13:53 +0100)]
Update package whitelist to track changes to java.lang.invoke.
The introduction of java.lang.invoke.MethodType and its supporting
classes, in particular.
bug:
30550796
test: make checkbuild
Change-Id: Id2b84d3bb911f4bc5aef0761d357b1e9121030ab
Dan Willemsen [Sun, 31 Jul 2016 23:45:32 +0000 (16:45 -0700)]
Don't clean obj/{APPS,JAVA_LIBRARIES} during installclean
Anything product specific in here should be caught by an explicit
dependency, or the command line changing. This drastically reduces the
build time after an installclean.
Before this change, we were re-running all dex2oat commands after each
installclean, even if nothing changed.
Change-Id: I9c735fe2c5d82109d56996021502319179e43671
Dan Willemsen [Sun, 31 Jul 2016 22:47:17 +0000 (15:47 -0700)]
Disable auto installclean for AAPT config change
PRODUCT_AAPT_CONFIG and PRODUCT_AAPT_PREF_CONFIG don't affect the
installed file list, they only affect how some files are built. The
changing command line is already noticed by ninja, so we'll only re-run
the necessary commands instead of a full installclean.
Change-Id: Ib918b2edeefc539b7f88cb22a1d751c397973b1d
Dan Willemsen [Sat, 30 Jul 2016 02:06:44 +0000 (02:06 +0000)]
Merge \"Refactor LOCAL_INIT_RC\"
am:
cc715fa5d4
Change-Id: I484480375235395fd55eb1cfbb0a50259c6d840e
Colin Cross [Sat, 30 Jul 2016 02:06:41 +0000 (02:06 +0000)]
Merge \"Don\'t depend on a phony target\"
am:
90cd97fd11
Change-Id: I185be0ffd30561125bcbc39c19429ae44e964bb8
Dan Willemsen [Fri, 29 Jul 2016 23:44:33 +0000 (23:44 +0000)]
Merge "Refactor LOCAL_INIT_RC"
Colin Cross [Fri, 29 Jul 2016 23:38:28 +0000 (23:38 +0000)]
Merge "Don't depend on a phony target"
Dan Willemsen [Thu, 28 Jul 2016 05:52:42 +0000 (22:52 -0700)]
Refactor LOCAL_INIT_RC
We supported de-duplicating LOCAL_INIT_RC across multiple architecture
variants in a single module definition, but that didn't work if the
module was defined with two different BUILD_PREBUILT definitions. That's
how we're exporting modules from Soong to Make.
Change-Id: Ifc93b15ef78ea3d8e78005d428a3ec57d7e414e8
Colin Cross [Fri, 29 Jul 2016 22:09:03 +0000 (15:09 -0700)]
Don't depend on a phony target
Phony targets are always dirty, depend on the ndk.timestamp file instead
of the ndk phony rule.
Change-Id: I8a90e61a1a79861af59f66f3bc0fdeecd0819992
Dan Willemsen [Fri, 29 Jul 2016 21:15:14 +0000 (14:15 -0700)]
resolve merge conflicts of
dd9aee1 to stage-aosp-master
Change-Id: I4278b9700c8729a06d38acc26e22ce7c340382f2
Dan Willemsen [Fri, 29 Jul 2016 20:47:14 +0000 (20:47 +0000)]
Merge "Record module type statistics"
Dan Willemsen [Mon, 25 Jul 2016 23:03:53 +0000 (16:03 -0700)]
Record module type statistics
Creates a build_system_stats.txt build artifact that contains statistics
on how many BUILD_* modules are defined in a build. Also writes out
information about the Soong module types sent from the Soong build.
Merged-In: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
Change-Id: Iaf0c7062f542dc6942b5349854f3d49267cac4a5
Dan Albert [Thu, 28 Jul 2016 16:06:24 +0000 (16:06 +0000)]
Merge changes from topic \'soong-sysroots\'
am:
65de8e446c
Change-Id: I8c8951364c5ddd6f99a27111acdb72097ab5db42
Dan Albert [Thu, 28 Jul 2016 15:58:51 +0000 (15:58 +0000)]
Merge changes from topic 'soong-sysroots'
* changes:
Add a phony target for the NDK sysroots.
Use the just built NDK headers and libs.
Add LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES.
Dan Albert [Thu, 28 Jul 2016 04:57:49 +0000 (21:57 -0700)]
Add a phony target for the NDK sysroots.
`make ndk` will build all the NDK sysroots.
Test: make ndk
Bug: http://b/
27533932
Change-Id: Ic2f5bf61f8911f7b8d08a473f2fe0576f3e06224
Dan Albert [Thu, 21 Jul 2016 17:04:12 +0000 (10:04 -0700)]
Use the just built NDK headers and libs.
The list of libraries is currently empty. Will add migrated libraries
in a follow up patch.
Test: Still builds.
Bug: http://b/
27533932
Change-Id: Ibd9750620ca2ae86fe888a8a993bd26493bc1c8a
Dan Albert [Wed, 20 Jul 2016 18:02:18 +0000 (11:02 -0700)]
Add LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES.
This allows a module to avoid being installed to the common library
directory.
Test: Prevents copying of NDK libraries with the NDK sysroot patches.
Bug: http://b/
27533932
Change-Id: I24f11d5a70595bcd524ac5bd85034c226d2de211
Tao Bao [Thu, 28 Jul 2016 04:41:18 +0000 (04:41 +0000)]
Merge \"Handle multiple APKs from the same package in check_target_files_signatures.py.\"
am:
653980bfe4
Change-Id: I9b47c241b8d8c879b6e1794e5c84ad9fd8541613
Tao Bao [Thu, 28 Jul 2016 04:28:38 +0000 (04:28 +0000)]
Merge "Handle multiple APKs from the same package in check_target_files_signatures.py."
Tao Bao [Thu, 28 Jul 2016 02:45:43 +0000 (19:45 -0700)]
Handle multiple APKs from the same package in check_target_files_signatures.py.
We were using the package name as the key to index APKs. APKs from the
same package got messed up and gave wrong signature summary. Switch to
using the package filename as the key, which is identical in a given build.
Also fix the trailing space when printing the signature summary.
Bug:
30418268
Test: Run with a target_files.zip that has multiple APKs from the same package.
Change-Id: I6317e8c05e987c5690915e05c294153d10e2f0ab
Dan Albert [Wed, 27 Jul 2016 21:30:32 +0000 (21:30 +0000)]
Merge \"Link to shared libraries with the full paths.\"
am:
b3389f4823
Change-Id: Ie305ebfb68c3bba6b8120ce0be807906c029fe92
Treehugger Robot [Wed, 27 Jul 2016 21:06:32 +0000 (21:06 +0000)]
Merge "Link to shared libraries with the full paths."