OSDN Git Service
Vishwath Mohan [Fri, 2 Sep 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
am:
0464662888
Change-Id: I16b6652473326811c0ceac3cb9997ff82c6ada73
Vishwath Mohan [Fri, 2 Sep 2016 21:27:41 +0000 (21:27 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
Vishwath Mohan [Fri, 2 Sep 2016 20:25:59 +0000 (13:25 -0700)]
Create sub-directory for fuzzers under nativetest.
This CL changes BUILD_FUZZ_TEST to generate binaries in a
sub-directory called fuzzers/ under the nativetest directory. This
allows fuzzers to be distinguished from the other native tests and
makes it easier to perform automated fuzz-testing.
Bug:
25714111
Change-Id: I452e43f15728ec9168dd44776b6ffcea6037fa7f
Sami Tolvanen [Fri, 2 Sep 2016 18:18:32 +0000 (18:18 +0000)]
Merge "build_image: add padding to match partition size"
am:
ef5751c1ec
Change-Id: Ia06afb7351d15b6726bd92cdbe92fca8b5116da3
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "build_image: add padding to match partition size"
Sami Tolvanen [Thu, 1 Sep 2016 22:58:35 +0000 (15:58 -0700)]
build_image: add padding to match partition size
For some partition sizes, we currently build an image that's 1-2
blocks smaller than the actual partition, which causes fs_mgr to
not find metadata. This change adds padding to FEC metadata that
correctly positions the metadata header at the end.
Bug:
28865197
Change-Id: Ie0e044715a9c5ae8ba395e7d2ff9fbd7cffc0b4c
Colin Cross [Thu, 1 Sep 2016 23:42:34 +0000 (23:42 +0000)]
Merge "Walk up tree to find makefiles in mma"
am:
5ccafd0f29
Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2
Treehugger Robot [Thu, 1 Sep 2016 23:34:52 +0000 (23:34 +0000)]
Merge "Walk up tree to find makefiles in mma"
Colin Cross [Thu, 1 Sep 2016 22:30:18 +0000 (15:30 -0700)]
Walk up tree to find makefiles in mma
Call findmakefile in mma to walk up the tree to find the nearest
makefile. Fixes mma in subdirectories of directories that have
Android.mk or Android.bp files.
Change-Id: I6fa509171699071fc34a2a75dd7e191d4ddca31a
Colin Cross [Thu, 1 Sep 2016 17:15:40 +0000 (17:15 +0000)]
Merge "Canonicalize mmm path"
am:
a5b02ff1ef
Change-Id: Ib9d8de38a7b5d63a2be023b538797df17c5451d5
Treehugger Robot [Thu, 1 Sep 2016 17:04:49 +0000 (17:04 +0000)]
Merge "Canonicalize mmm path"
Colin Cross [Thu, 1 Sep 2016 16:09:29 +0000 (16:09 +0000)]
Merge "Don't double-wrap with gomacc"
am:
b7a12806b1
Change-Id: If5e9b3a9dabfd3db9b16fe37e5ed0ffad956cfbb
Colin Cross [Thu, 1 Sep 2016 15:59:38 +0000 (15:59 +0000)]
Merge "Don't double-wrap with gomacc"
Colin Cross [Thu, 1 Sep 2016 00:22:36 +0000 (17:22 -0700)]
Canonicalize mmm path
Canonicalize the mmm path relative to the top level before creating the
MODULES-IN-dir target. Fixes cd frameworks/base; mmm -j .
Test: cd frameworks/base; mmm -j
Change-Id: If7bc321e8a87b76121f876bf4bc296b0f9b80578
Colin Cross [Wed, 31 Aug 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Create more shortcut phony targets"
am:
44303e9f26
Change-Id: I0b42e1f01e7a0eb1b731459c581155b952e67a19
Colin Cross [Wed, 31 Aug 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Create more shortcut phony targets"
Colin Cross [Wed, 31 Aug 2016 20:32:39 +0000 (13:32 -0700)]
Don't double-wrap with gomacc
config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER. Only export it from make so gomacc doesn't appear twice on
the command line.
Bug:
31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
Colin Cross [Wed, 31 Aug 2016 20:18:49 +0000 (20:18 +0000)]
Merge "Enable goma in soong"
am:
753ed863c5
Change-Id: I10cd9f5f447124b0aff58b8aaf7a0fadafe3ac59
Colin Cross [Wed, 31 Aug 2016 20:08:57 +0000 (20:08 +0000)]
Merge "Enable goma in soong"
Colin Cross [Wed, 31 Aug 2016 16:35:32 +0000 (09:35 -0700)]
Enable goma in soong
Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.
Bug:
31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
Dan Willemsen [Wed, 31 Aug 2016 16:11:46 +0000 (16:11 +0000)]
Merge "Simplify Soong bootstrapping"
am:
2e5dc07c1f
Change-Id: I90835790fe8a2b6d526a8c345638c8380972beaa
Dan Willemsen [Wed, 31 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "Simplify Soong bootstrapping"
Dan Willemsen [Mon, 15 Aug 2016 20:38:21 +0000 (13:38 -0700)]
Simplify Soong bootstrapping
Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.
Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
Colin Cross [Tue, 30 Aug 2016 23:16:32 +0000 (16:16 -0700)]
Create more shortcut phony targets
Create shortcut phony targets for the host and device halves of
modules.
Change-Id: I1cf3a49118db830d78a1b83b2177715175949871
Dan Willemsen [Mon, 29 Aug 2016 20:44:16 +0000 (20:44 +0000)]
Merge "Check USE_GOMA consistently"
am:
049dd57872
Change-Id: Ia838646334435a7bdbd862db2c7b2a697c791265
Treehugger Robot [Mon, 29 Aug 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Check USE_GOMA consistently"
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:55:38 +0000 (19:55 +0000)]
Merge "Switch to prebuilt clang-
3217047"
am:
3500ddfe1b
Change-Id: I9d9e8ef2be4158afa814279b073a1109a12f1970
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:38:34 +0000 (19:38 +0000)]
Merge "Switch to prebuilt clang-
3217047"
Dan Willemsen [Sun, 28 Aug 2016 01:29:08 +0000 (18:29 -0700)]
Check USE_GOMA consistently
Currently, the only way to properly disable goma is to unset USE_GOMA.
If you set USE_GOMA=false, we won't turn on goma, but we'll pass -j500
to ninja.
Test: USE_GOMA={x,false} m -j48 showcommands (inspect)
Change-Id: I6b327d08ebadbe614a3bf7646fd597054bbfaaa2
Dan Willemsen [Fri, 26 Aug 2016 22:49:04 +0000 (22:49 +0000)]
Merge "Identify modules ready to be converted to Soong"
am:
c6bada8acd
Change-Id: Ia180357da71fbce20e0b06503fbc29481b2160af
Treehugger Robot [Fri, 26 Aug 2016 22:37:19 +0000 (22:37 +0000)]
Merge "Identify modules ready to be converted to Soong"
Pirama Arumuga Nainar [Wed, 24 Aug 2016 16:43:44 +0000 (09:43 -0700)]
Switch to prebuilt clang-
3217047
Bug: http://b/
30421084
Change-Id: I41acd016992a0c5043b6ea018f205fad44c88b9e
Test: Tested build, boot and common usage for several devices in AOSP
and internal branch.
Dan Willemsen [Fri, 26 Aug 2016 20:27:13 +0000 (13:27 -0700)]
Identify modules ready to be converted to Soong
The output will be in the `m dist` results as soong_to_convert.txt, or
can be built using:
$ m $OUT/soong_to_convert.txt
The output is a list of modules that are probably ready to convert to
Soong:
# Blocked on Module (potential problems)
283 libEGL (srcs_dotarm)
246 libicuuc (dotdot_incs dotdot_srcs)
221 libspeexresampler
215 libcamera_metadata
...
0 zram-perf (dotdot_incs)
The number at the beginning of the line shows how many native modules
depend on that module.
All of their dependencies have been satisfied, and any potential
problems that Make can detect are listed in parenthesis after the
module:
dotdot_srcs: LOCAL_SRC_FILES contains paths outside $(LOCAL_PATH)
dotdot_incs: LOCAL_C_INCLUDES contains paths include '..'
srcs_dotarm: LOCAL_SRC_FILES contains source files like <...>.c.arm
aidl: LOCAL_SRC_FILES contains .aidl sources
dbus: LOCAL_SRC_FILES contains .dbus-xml sources
objc: LOCAL_SRC_FILES contains Objective-C sources
proto: LOCAL_SRC_FILES contains .proto sources
rs: LOCAL_SRC_FILES contains renderscript sources
vts: LOCAL_SRC_FILES contains .vts sources
Not all problems can be discovered, but this is a starting point.
Change-Id: I45674fe93fd267d4d1fb0bc3bc9aa025e20c5ac6
Colin Cross [Fri, 26 Aug 2016 00:06:04 +0000 (00:06 +0000)]
Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong"
am:
fe3163400e
Change-Id: I27cb5c1cd17444a68b6fe4842d58e8ac3cf75979
Treehugger Robot [Fri, 26 Aug 2016 00:02:34 +0000 (00:02 +0000)]
Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong"
Colin Cross [Wed, 24 Aug 2016 22:29:38 +0000 (15:29 -0700)]
Export TARGET_PREFER_32_BIT_EXECUTABLES to soong
Change-Id: I1427d88c7539c5ed0c4c238bad4a28f73d29ef0f
Colin Cross [Thu, 25 Aug 2016 20:47:19 +0000 (20:47 +0000)]
Merge "Install symlinks when using shortcut phony targets"
am:
6f1cf129f2
Change-Id: I73386358b3b74ed71f0e3640eb06b74eb923fb5a
Colin Cross [Thu, 25 Aug 2016 20:39:31 +0000 (20:39 +0000)]
Merge "Install symlinks when using shortcut phony targets"
Chih-hung Hsieh [Thu, 25 Aug 2016 02:33:59 +0000 (02:33 +0000)]
Merge "Suppress clang-tidy checks in frameworks/compile/mclinker."
am:
a9ee94f441
Change-Id: I9b3d7949d58fe6f6c80b7717c61e8efe8b5bc706
Chih-hung Hsieh [Thu, 25 Aug 2016 02:24:32 +0000 (02:24 +0000)]
Merge "Suppress clang-tidy checks in frameworks/compile/mclinker."
Colin Cross [Wed, 24 Aug 2016 22:20:23 +0000 (15:20 -0700)]
Install symlinks when using shortcut phony targets
Make symlinks an order-only dependency of the module name phony target
so that they get installed with make module or make MODULES-IN-path.
Test: mmma -j art/dalvikvm, remove symlink in $OUT and retry
Change-Id: Iae472a1c8fa1e8386cc9556cfe819bd4fca99428
Tianjie Xu [Wed, 24 Aug 2016 21:15:33 +0000 (21:15 +0000)]
Merge "Don't regenerate userdata.img when signing"
am:
a7adc06e68
Change-Id: Ib6139262f366fa864e03d98796e5384fa12c7c55
Treehugger Robot [Wed, 24 Aug 2016 21:10:07 +0000 (21:10 +0000)]
Merge "Don't regenerate userdata.img when signing"
Chih-hung Hsieh [Wed, 24 Aug 2016 21:00:01 +0000 (21:00 +0000)]
Merge "Recognize new warning messages."
am:
b8f6f5dced
Change-Id: I1d3ee3bed661be31f03b76e5c2abfd3e56d18bff
Chih-hung Hsieh [Wed, 24 Aug 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Recognize new warning messages."
Chih-Hung Hsieh [Wed, 24 Aug 2016 19:24:32 +0000 (12:24 -0700)]
Recognize new warning messages.
* Generalize regular expression to match new warning messages.
* Remove old unused pattern.
Change-Id: I54f2e5bdb255b290cb3751ba56558f5fe8d7245e
Test: Run warn.py with build.log
Tianjie Xu [Thu, 4 Aug 2016 02:21:52 +0000 (19:21 -0700)]
Don't regenerate userdata.img when signing
The userdata.img and cache.img entries are not useful in signed builds;
because fastboot doesn't look at these two entries in the *img.zip when
flashing a device. And they aren't used elsewhere. Therefore, skip
building the image files for them when signing the target files with
sign_target_files_apks. Also, add an option "--is_signing" to avoid
adding these two images when we call add_img_to_target_files.
Change-Id: I39ba91a86d9a856d7d01771f6d1403dbf21f2011
Test: Run sign_target_files_apks on a target file and userdata/cache.img doesn't not generate.
Bug:
30642470
Yohann Roussel [Wed, 24 Aug 2016 09:50:29 +0000 (09:50 +0000)]
Merge "Allow selection of prebuilts min sdk"
am:
624619d4d0
Change-Id: I54df2acb3003c0222b3f3d909d3f9c80dfda493d
Yohann Roussel [Wed, 24 Aug 2016 09:39:30 +0000 (09:39 +0000)]
Merge "Allow selection of prebuilts min sdk"
Chih-Hung Hsieh [Tue, 23 Aug 2016 18:07:19 +0000 (11:07 -0700)]
Suppress clang-tidy checks in frameworks/compile/mclinker.
Too many warnings need to wait for upstream changes.
Test: build with WITH_TIDY=1.
Change-Id: I0b1272049ad757670182668db130512a538b3096
Casey Dahlin [Tue, 23 Aug 2016 00:56:19 +0000 (00:56 +0000)]
Merge "List partition_table.bpt as an output of running bpttool"
am:
aba93cf736
Change-Id: Ib986d3551a2bfff5ce813139380378b11dd84d82
Treehugger Robot [Tue, 23 Aug 2016 00:41:52 +0000 (00:41 +0000)]
Merge "List partition_table.bpt as an output of running bpttool"
Casey Dahlin [Fri, 19 Aug 2016 17:59:57 +0000 (10:59 -0700)]
List partition_table.bpt as an output of running bpttool
Change-Id: I8bb1e03e451bf148e421ecac346bf20ce5d4695b
Test: Verified builds can now depend on partition_table.bpt
Bug:
30971990
Tao Bao [Mon, 22 Aug 2016 19:09:55 +0000 (19:09 +0000)]
Merge "releasetools: Allow creating target_files with ZIP64."
am:
794c69e603
Change-Id: I94eac12de16cac4e4034d933f83fbfa61ca20591
Treehugger Robot [Mon, 22 Aug 2016 18:59:13 +0000 (18:59 +0000)]
Merge "releasetools: Allow creating target_files with ZIP64."
Tao Bao [Mon, 22 Aug 2016 17:31:05 +0000 (10:31 -0700)]
releasetools: Allow creating target_files with ZIP64.
add_img_to_target_files.py fails when the target_files.zip is over 4GiB
when adding IMAGES/ folder. Specify the flag to allow creating
target_files.zip with ZIP64 extension.
Other zip artifacts (-img.zip, -ota.zip etc) remain in non-ZIP64 format.
zip2zip is not affected, which still creates non-ZIP64 zips even when
copying from target_files in ZIP64.
Bug:
30961841
Test: "make dist" with large system image and check the artifacts.
Change-Id: I0568745f01ef8f0239081f783eac92288d4fdd84
Yohann Roussel [Fri, 19 Aug 2016 16:57:34 +0000 (18:57 +0200)]
Allow selection of prebuilts min sdk
Bug:
30966099
Change-Id: I55128d5a321bd65b4e12b90afbf7efe8ccb35829
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."