OSDN Git Service
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."
Dan Albert [Tue, 26 Jul 2016 18:54:47 +0000 (11:54 -0700)]
Link to shared libraries with the full paths.
This ensures that we're not accidentally linking the wrong version of
a library with the same name thanks to -L.
Test: Still builds.
Change-Id: I22e9e28412844ff4f8bda42ebbc300ea6574e474
Chih-Hung Hsieh [Wed, 27 Jul 2016 17:28:33 +0000 (10:28 -0700)]
Fix clang-tidy performance warnings.
* Use const reference parameter type to avoid unnecessary copy.
Bug:
30407689
Change-Id: Iefab05c077367f272abf545036b853e8a295c8cd
Test: build with WITH_TIDY=1
Dan Willemsen [Wed, 27 Jul 2016 00:45:17 +0000 (00:45 +0000)]
Merge \"Pass binder ABI to Soong\"
am:
4b4fdf0b2f
Change-Id: I117ad1700d33aead72ab510ab824054d30dde369
Chih-Hung Hsieh [Wed, 27 Jul 2016 00:45:13 +0000 (00:45 +0000)]
Merge \"Add option to dump HTML warnings per project.\"
am:
620ce44a7a
Change-Id: If37ceb0cbbf43356a9df2681eb192b09c2c6a551
Chih-Hung Hsieh [Wed, 27 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Add performance* to default global tidy checks.\"
am:
32c8bcf0bd
Change-Id: I9bb84dd4e53d84c3c9ad228616fa7f7839075128
Treehugger Robot [Wed, 27 Jul 2016 00:14:59 +0000 (00:14 +0000)]
Merge "Pass binder ABI to Soong"
Treehugger Robot [Tue, 26 Jul 2016 23:04:29 +0000 (23:04 +0000)]
Merge "Add option to dump HTML warnings per project."
Dan Willemsen [Tue, 26 Jul 2016 03:23:58 +0000 (20:23 -0700)]
Pass binder ABI to Soong
Change-Id: I7a7f197a114c39ab3a4233d430d9c677f581b1f9
Treehugger Robot [Tue, 26 Jul 2016 22:44:36 +0000 (22:44 +0000)]
Merge "Add performance* to default global tidy checks."
Chih-Hung Hsieh [Fri, 22 Jul 2016 21:09:31 +0000 (14:09 -0700)]
Add option to dump HTML warnings per project.
* Use --byproject flag to dump warnings in HTML file by projects.
* Add external/google and vendor/google projects, vs other
external/non-google and vendor/non-google projects.
* Refactor code in dumpcategory to dump warnings by projects
when --byproject is specified.
* Recognize new compiler -Wvarargs warning pattern.
* No change to default HTML output format.
Change-Id: I2406ad392ab18683357ff0ee0cf6c41f87cf399c
Test: run through current build.log files.
Chih-Hung Hsieh [Tue, 26 Jul 2016 21:27:03 +0000 (14:27 -0700)]
Add performance* to default global tidy checks.
* This enables 5 performance related checks:
performance-faster-string-find
performance-for-range-copy
performance-implicit-cast-in-loop
performance-unnecessary-copy-initialization
performance-unnecessary-value-param
* Recognize these new warnings in warn.py.
Bug: http://b/
27779618
Change-Id: I7af3fdc262dd44db90d3b62eb37c5eac5a2eaa01
Test: build with WITH_TIDY=1 and run warn.py with build.log
Alex Deymo [Tue, 26 Jul 2016 00:45:46 +0000 (00:45 +0000)]
Merge \"Remove unused libraries from otatools.\"
am:
4698a191e5
Change-Id: I6a1203c2c789d7f3e4e6c5d048c6ec766f172915
Treehugger Robot [Tue, 26 Jul 2016 00:36:57 +0000 (00:36 +0000)]
Merge "Remove unused libraries from otatools."
Alex Deymo [Mon, 25 Jul 2016 23:08:39 +0000 (16:08 -0700)]
Remove unused libraries from otatools.
libbrillo-http was actually never used but it was being liked into
delta_generator anyway.
Bug: None
TEST=`lddtree delta_generator` doesn't show librillo-http.
Change-Id: I69ac66c87847d925b5798cf261c79466a3ff432a
Dan Willemsen [Sat, 23 Jul 2016 00:49:58 +0000 (00:49 +0000)]
Merge \"Revert \"Rename libevent-host to libevent\"\"
am:
79498a069a
Change-Id: Id2d9cc234438de271a5d83b44c77806fba32a5bf
Treehugger Robot [Sat, 23 Jul 2016 00:40:35 +0000 (00:40 +0000)]
Merge "Revert "Rename libevent-host to libevent""
Dan Willemsen [Fri, 22 Jul 2016 23:16:30 +0000 (23:16 +0000)]
Revert "Rename libevent-host to libevent"
This reverts commit
ef31fc6477e1424f507095d1478f21445d569a21.
It's now using unique_host_soname to use a different installed name,
but keeping the libevent module name.
Change-Id: I1cb6e8e670636089993054236b089da059629da1
Narayan Kamath [Fri, 22 Jul 2016 09:40:35 +0000 (09:40 +0000)]
Merge \"Add java.lang.invoke to the package whitelist.\"
am:
900e9e6392
Change-Id: I5d25d40dc0b661ff1acaa957145f32c0f13da853
Narayan Kamath [Fri, 22 Jul 2016 09:33:16 +0000 (09:33 +0000)]
Merge "Add java.lang.invoke to the package whitelist."
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:02:47 +0000 (01:02 +0000)]
Merge \"Count warnings per project and dump out CSV format.\"
am:
053c54b554
Change-Id: I22315bc641d501e74b995ddde8d7624fa9a6b883
Chih-hung Hsieh [Fri, 22 Jul 2016 00:54:50 +0000 (00:54 +0000)]
Merge "Count warnings per project and dump out CSV format."
Chih-Hung Hsieh [Thu, 21 Jul 2016 21:22:53 +0000 (14:22 -0700)]
Count warnings per project and dump out CSV format.
* No change to html output, except removing unused "PageTop" anchor.
* Add --gencsv flag to output a CSV file instead of html file.
CSV files are combined to a table for dashboard charts.
* Count warnings from selected source project directories.
* CSV output lines are:
num_of_warnings,project_name,warning_description
* project_name is empty for sum of warnings from all projects.
* warning_description could be:
(1) "<severity>: <warning type description>"
for one warning type, or
(2) "<severity> warnings"
for all warning types of the severity.
Change-Id: I1cf976ed0cf142091226b22665b7f28d383608fd
Test: run through current build.log files.
Colin Cross [Thu, 21 Jul 2016 17:58:10 +0000 (17:58 +0000)]
Merge \"Split -isystem headers into separate variables\"
am:
921be36569
Change-Id: Icd539e53caa9ad55e900b394c6005bb3606dce70
Colin Cross [Thu, 21 Jul 2016 17:51:13 +0000 (17:51 +0000)]
Merge "Split -isystem headers into separate variables"
Narayan Kamath [Thu, 21 Jul 2016 11:06:57 +0000 (12:06 +0100)]
Add java.lang.invoke to the package whitelist.
Tracks libcore change that adds the first classes from this package
to core-oj.jar. Note that packages need to be whitelisted even if
the classes in question aren't public API.
Test: make checkbuild docs
Change-Id: I917dc63899124ca30bbeb2902787faea6754bb43
Colin Cross [Wed, 20 Jul 2016 19:22:57 +0000 (12:22 -0700)]
Split -isystem headers into separate variables
Split the variables that contain header directories into ones that
should be prefixed with -isystem and ones that should be prefixed with
-I in preparation for moving some headers from -isystem to -I.
Add $(wildcard) around SRC_HEADERS to match the soong behavior, and move
users of SRC_HEADERS from config.mk to binary.mk so that the exported
soong value is present.
Test: no changes to build.ninja compile rules
Change-Id: Iadecbbf4351a01e53cb57e721d31f4f836bb82d9
Chih-Hung Hsieh [Wed, 20 Jul 2016 23:08:36 +0000 (23:08 +0000)]
Merge \"Recognize new clang and clang-tidy warnings.\"
am:
6131119708
Change-Id: If307f868da5d961ad3c1cac371ca3e5a42a6b652
Treehugger Robot [Wed, 20 Jul 2016 22:57:29 +0000 (22:57 +0000)]
Merge "Recognize new clang and clang-tidy warnings."
Chih-Hung Hsieh [Wed, 20 Jul 2016 17:08:51 +0000 (10:08 -0700)]
Recognize new clang and clang-tidy warnings.
* Count new clang-tidy warnings:
google-runtime-references
google-runtime-operator
* Count new clang warnings:
-Wconst-conversion similar to -Wliteral-conversion
-Wundefined-var-template
* Modified static analyzer warning message about
"Null passed to a callee that requires a non-null ..."
* Disable google-runtime-references by default and
disable misc-macro-parentheses in vendor projects;
too many old C/C++ code have this warning.
Change-Id: Ib35e0af85875aada17c92b0237b76cd5ae3bfcc8
Test: build with clang-tidy.
Colin Cross [Wed, 20 Jul 2016 21:24:29 +0000 (21:24 +0000)]
Merge \"Factor out common include directories into helper\"
am:
95fa32b577
Change-Id: I720d7c02de3d11b4a5a3328946433aa7274f1bb6
Treehugger Robot [Wed, 20 Jul 2016 21:11:22 +0000 (21:11 +0000)]
Merge "Factor out common include directories into helper"
Fang Deng [Tue, 19 Jul 2016 23:41:57 +0000 (23:41 +0000)]
Merge \"Remove GOMA_HERMETIC form goma.mk\"
am:
14df2ef4d0
Change-Id: Ie9612d77fd35fb25aaad6db1b8c690b139cc1764
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:37 +0000 (23:40 +0000)]
Merge \"Switch to prebuilt clang-
3016494\"
am:
b1beb6f274
Change-Id: Ic0cc4734481cddb87ed8c21d2079ab0645dbcc82
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:40:23 +0000 (23:40 +0000)]
Merge \"Disable warnings triggered in Clang r271374\"
am:
11e0e36462
Change-Id: I315936308c883352a195dc4aff0b9f42757019f1
Fang Deng [Tue, 19 Jul 2016 23:32:37 +0000 (23:32 +0000)]
Merge "Remove GOMA_HERMETIC form goma.mk"
Colin Cross [Tue, 19 Jul 2016 20:19:21 +0000 (13:19 -0700)]
Factor out common include directories into helper
Refactor includes in transform-*-to-o to simplify future changes to the
default include paths.
Test: whitespace-only changes to the compile rules in build.ninja
Change-Id: I766af1f22a4838d933691b6df37530db3ba4e21d
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Switch to prebuilt clang-
3016494"
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warnings triggered in Clang r271374"
Fang Deng [Tue, 19 Jul 2016 01:33:04 +0000 (01:33 +0000)]
Remove GOMA_HERMETIC form goma.mk
This CL removes the GOMA_HERMETIC setting from goma.mk so that
the default setting will be used. By default, GOMA will fallback
to local compiler if the exactly matched compiler is not available.
Change-Id: I22c83594f6bd30bc8ed1334ab7bb256ef218567b
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:54:33 +0000 (10:54 -0700)]
Disable warnings triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wnull-dereference. The second bug above tracks that this
warning gets re-enabled.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ie41a495dd9bb247d3609f4848d7669d1faaeeb79
Pirama Arumuga Nainar [Tue, 28 Jun 2016 17:58:39 +0000 (10:58 -0700)]
Switch to prebuilt clang-
3016494
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Bug: http://b/
29823425
Change-Id: I97299c8b41ff9d3ac7019a349aa569609a099233
Chih-Hung Hsieh [Mon, 18 Jul 2016 23:38:24 +0000 (23:38 +0000)]
Merge \"Avoid matching the same warning line twice.\"
am:
0cbba3df2a
Change-Id: I641fa895ac7033056833107bf062015987965632
Treehugger Robot [Mon, 18 Jul 2016 23:18:47 +0000 (23:18 +0000)]
Merge "Avoid matching the same warning line twice."
Chih-Hung Hsieh [Mon, 18 Jul 2016 22:27:02 +0000 (15:27 -0700)]
Avoid matching the same warning line twice.
Used to skip only immediately followed identical warning lines.
Now classifywarning is called only once for each unique warning line.
Change-Id: Ie3b77ded70b41dafad91c042dbe15ad2be119e62
Test: run through build.log file
Dan Willemsen [Mon, 18 Jul 2016 19:26:18 +0000 (19:26 +0000)]
Merge \"Rename libevent-host to libevent\"
am:
575a023039
Change-Id: Ia98511562db8071258101d38f83f4083db966357
Dan Willemsen [Mon, 18 Jul 2016 19:18:32 +0000 (19:18 +0000)]
Merge "Rename libevent-host to libevent"
Colin Cross [Sun, 17 Jul 2016 23:45:02 +0000 (23:45 +0000)]
Merge \"Only add linker_asan as dependency to shared executables\"
am:
458c0cd37b
Change-Id: I4c50d21b480200588d4581662d9fda86bb18ee3b
Colin Cross [Sun, 17 Jul 2016 23:38:39 +0000 (23:38 +0000)]
Merge "Only add linker_asan as dependency to shared executables"
Colin Cross [Sun, 17 Jul 2016 22:28:07 +0000 (15:28 -0700)]
Only add linker_asan as dependency to shared executables
linker_asan is only needed by shared exectuables, prevent adding it as a
dependency of anything else. Avoids a dependency loop from
linker_asan -> linker -> linker_asan.
Change-Id: Id7744ad8a5901468518fac80741c75e764adb559
Colin Cross [Fri, 15 Jul 2016 21:49:45 +0000 (14:49 -0700)]
resolve merge conflicts of
1e92cfb to stage-aosp-master
Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3
Treehugger Robot [Fri, 15 Jul 2016 21:34:33 +0000 (21:34 +0000)]
Merge "Add support for LOCAL_MODULE_SYMLINKS"
Colin Cross [Thu, 14 Jul 2016 23:02:57 +0000 (16:02 -0700)]
Add support for LOCAL_MODULE_SYMLINKS
Specifying LOCAL_MODULE_SYMLINKS will create symlinks to the installed
module in the same directory.
Change-Id: Idecb2b75f0c9999eb000eed9a79a989244ccf6c2
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:10:40 +0000 (17:10 +0000)]
Merge \"Add build variant to kernel command line\"
am:
70a9714625
Change-Id: I5e10a5375f50e9562af73407212fd4a800884b20
Badhri Jagan Sridharan [Fri, 15 Jul 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Add build variant to kernel command line"
Dan Willemsen [Thu, 14 Jul 2016 06:47:24 +0000 (23:47 -0700)]
Rename libevent-host to libevent
There's no need to use a different name for target and host modules, and
in Soong, it's better to use the same for both.
Change-Id: Ib2d8d0cc8a1e0f7f95d7c2795a360f02d946fa1a
Dan Willemsen [Thu, 14 Jul 2016 04:09:47 +0000 (04:09 +0000)]
Merge \"Allow prebuilts to specify mini-debug-info\"
am:
4ea20be28b
Change-Id: I410014ad90800d78753f0c5c8cbb948aef369614
Dan Willemsen [Thu, 14 Jul 2016 04:04:42 +0000 (04:04 +0000)]
Merge "Allow prebuilts to specify mini-debug-info"
Dan Willemsen [Wed, 13 Jul 2016 23:08:36 +0000 (16:08 -0700)]
Allow prebuilts to specify mini-debug-info
So that Soong can specify the default that's used by Make.
Change-Id: I0c1062ad8f21df8b9a483f99dce679a1434e4859
Gaelle Nassiet [Wed, 13 Jul 2016 23:15:12 +0000 (23:15 +0000)]
Merge \"Fix root_filesystem_config.txt generation\"
am:
461a3283d9
Change-Id: I07ebb4520d02948bff90911d03692d7896dff89c
Tao Bao [Wed, 13 Jul 2016 23:04:10 +0000 (23:04 +0000)]
Merge "Fix root_filesystem_config.txt generation"
Dan Willemsen [Wed, 13 Jul 2016 00:41:21 +0000 (00:41 +0000)]
Merge \"Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong\"
am:
b8bd19db88
Change-Id: I4d8f00990957b583bf58c4e7770fd73430526431
Treehugger Robot [Wed, 13 Jul 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong"
Dan Willemsen [Tue, 12 Jul 2016 22:00:46 +0000 (15:00 -0700)]
Pass ENABLE_CPUSETS and ENABLE_SCHEDBOOST to Soong
Change-Id: I75c0d60854f2ea3d2e4e4d6dcbc6845e3b0336ad
Dan Willemsen [Tue, 12 Jul 2016 21:19:46 +0000 (21:19 +0000)]
Merge \"Turn ndk link check warning into error\"
am:
32ebe53d01
Change-Id: I89ff2a720b27a288b9f64412dd213d7019ffca66
Treehugger Robot [Tue, 12 Jul 2016 21:09:32 +0000 (21:09 +0000)]
Merge "Turn ndk link check warning into error"
Dan Willemsen [Tue, 12 Jul 2016 20:10:31 +0000 (13:10 -0700)]
Turn ndk link check warning into error
All instances of this have been removed from the downstream trees. The
APK->JNI_SHARED_LIBRARY and Java->Java checks remain as warnings.
Change-Id: I3eaee284500deee0f26a4f9cdd96497e99ec533e
Colin Cross [Tue, 12 Jul 2016 16:20:29 +0000 (16:20 +0000)]
Merge \"Remove Android.bp logic from makefiles\"
am:
8bc18d35ec
Change-Id: I50c8180c8297feb48ff5c5eba10670b36f631921
Colin Cross [Tue, 12 Jul 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove Android.bp logic from makefiles"
Colin Cross [Mon, 11 Jul 2016 23:57:33 +0000 (16:57 -0700)]
Remove Android.bp logic from makefiles
When Soong was optional, the make build system needed extra complexity
to ignore Android.mk files that had an associated Android.bp file. Now
that Soong is required and the Android.mk files that were obsoleted by
an associated Android.bp file have been removed, remove all of the logic
that found associated Android.bp files. Android.mk files and Android.bp
files are now handled independently.
Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35
Dan Willemsen [Mon, 11 Jul 2016 20:27:08 +0000 (20:27 +0000)]
Merge \"Extend SDK link check to java libraries\"
am:
e706372ba1
Change-Id: Ia4cb9cfe94da5bdccce8726ed8777de13638bada
Dan Willemsen [Mon, 11 Jul 2016 20:20:40 +0000 (20:20 +0000)]
Merge "Extend SDK link check to java libraries"
Tao Bao [Mon, 11 Jul 2016 16:08:24 +0000 (09:08 -0700)]
resolve merge conflicts of
4058a71 to stage-aosp-master
Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916