Commit Graph

32493 Commits

Author SHA1 Message Date
Chih-hung Hsieh
dec1367ad3 Merge "Separate parallel_classify_warnings out of parse_input_file." am: e4fb495b09
am: 70bbbdfdb1

Change-Id: I55481ce62ad45f1c8a6769ca8e2ca78f5d75601f
2016-11-15 22:42:04 +00:00
Chih-hung Hsieh
70bbbdfdb1 Merge "Separate parallel_classify_warnings out of parse_input_file."
am: e4fb495b09

Change-Id: I5353f10ea0d78d8d9cd4539e4095b9c0ff010520
2016-11-15 22:34:03 +00:00
Chih-hung Hsieh
e4fb495b09 Merge "Separate parallel_classify_warnings out of parse_input_file." 2016-11-15 22:19:36 +00:00
Robert Sesek
43596505af Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES." am: 07b4a59843 am: cda21868aa
am: 24f01c6d9d

Change-Id: I60b1802c196850d8d1465aae6fcd6c467d16a956
2016-11-15 19:44:52 +00:00
Robert Sesek
24f01c6d9d Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES." am: 07b4a59843
am: cda21868aa

Change-Id: If2da240948e59c289fe9b94f80ecf6b25e240318
2016-11-15 19:38:22 +00:00
Robert Sesek
cda21868aa Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES."
am: 07b4a59843

Change-Id: Ie5dc3d3d617203ea467ace4440ef0119cb75ad75
2016-11-15 19:30:51 +00:00
Treehugger Robot
07b4a59843 Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES." 2016-11-15 19:21:13 +00:00
Dan Willemsen
31488c301b Merge "Use new -ninja flag to aidl-cpp" am: 7d4c926ed7 am: 676610e090
am: bcb8dfe2b2

Change-Id: I3f89b97c0105486bff26ee61222e55d9b9e45fb1
2016-11-13 20:14:46 +00:00
Dan Willemsen
bcb8dfe2b2 Merge "Use new -ninja flag to aidl-cpp" am: 7d4c926ed7
am: 676610e090

Change-Id: I0fdc9d0cb82d9dd9788ad1fa767a0700667509c5
2016-11-13 20:07:15 +00:00
Dan Willemsen
676610e090 Merge "Use new -ninja flag to aidl-cpp"
am: 7d4c926ed7

Change-Id: I165926e0c23a8a9a7dd8f3e46956b53f53d7fc9f
2016-11-13 20:00:16 +00:00
Dan Willemsen
7d4c926ed7 Merge "Use new -ninja flag to aidl-cpp" 2016-11-13 19:53:39 +00:00
Dan Willemsen
fb84281342 Use new -ninja flag to aidl-cpp
This make aidl-cpp write out a dep file that ninja parses correctly.

Test: Manually inspect ninja depfile
Change-Id: I4890a91eb29a6388e17b1ffac23a3dc0ffe6c212
2016-11-13 09:44:25 -08:00
Dan Willemsen
db4c584a67 Merge "Remove transform-d-to-p" am: da85fecaf1 am: 39826d3cc7
am: 1551f77f83

Change-Id: I5207c203270068f45d2ed3136af0cebe245ede79
2016-11-11 21:55:55 +00:00
Dan Willemsen
1551f77f83 Merge "Remove transform-d-to-p" am: da85fecaf1
am: 39826d3cc7

Change-Id: I4ee6cba83e0c76404424d840d58f20a89c5c8953
2016-11-11 21:49:55 +00:00
Dan Willemsen
39826d3cc7 Merge "Remove transform-d-to-p"
am: da85fecaf1

Change-Id: Ieb010ebfe46ce9312b833191319d56155cc0b397
2016-11-11 21:42:29 +00:00
Dan Willemsen
da85fecaf1 Merge "Remove transform-d-to-p" 2016-11-11 21:38:53 +00:00
Robert Sesek
dcb603f115 Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES.
Test: lunch aosp_angler-eng && m checkbuild

Bug: 21643067
Change-Id: I1e0b81055fb74d7238f245e11bf2409c776f2efd
2016-11-11 12:38:13 -05:00
Dan Willemsen
16953b869c Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87 am: c87ea75be2
am: a8a8e13f81

Change-Id: I0593fea782aab91596d98a6da1502bce2d1649c4
2016-11-11 05:55:03 +00:00
Dan Willemsen
461d844a40 Remove transform-d-to-p
Ninja doesn't need the phony make targets, in fact, the parser doesn't
handle them correctly and ends up duplicating the dependencies. This
shrinks a `m native` deps file from 54M -> 35M on AOSP.

Test: Compare out/build-aosp_angler.ninja before/after
Test: wrote a tool to dump the .ninja_deps, added dedup feature, files
      identical after dedup.
Change-Id: Iec7a9a0739e8678c1f4db79c68e423a39b9aad4b
2016-11-10 21:55:01 -08:00
Dan Willemsen
a8a8e13f81 Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87
am: c87ea75be2

Change-Id: Ib813483882362a1165f6bbc287bde1a80cd519eb
2016-11-11 05:48:02 +00:00
Dan Willemsen
c87ea75be2 Merge "Fix vendor/google/build/ninja_config.mk"
am: a9daf15d87

Change-Id: I15afdf34b43317b3566a3c390b09f57fafbadec9
2016-11-11 05:41:02 +00:00
Dan Willemsen
a9daf15d87 Merge "Fix vendor/google/build/ninja_config.mk" 2016-11-11 05:35:05 +00:00
Dan Willemsen
1ff5fa11c4 Fix vendor/google/build/ninja_config.mk
This needs to be included between PARSE_TIME_MAKE_GOALS and KATI_GOALS

Test: m -j <target-from-internal>
Change-Id: I7284f05336b921d40f04ff5811a47bd0d17a066f
2016-11-10 19:41:27 -08:00
Dan Willemsen
53e46ba3ca Merge changes I1bc291aa,Ib3ec8aa8 am: 0f185d7c3b am: b63b2021d6
am: 6dc0831d69

Change-Id: Ibd08701b313bf31d4f144f225a9f3e3d1e00c59e
2016-11-10 23:17:47 +00:00
Dan Willemsen
c6bdb139d7 Split (ninja|soong).mk into config and rule portions am: 04f53ed923 am: 0c3eaa8cf4
am: 206a26306d

Change-Id: I863436859163945ef2999814a091ca2c7f339b3c
2016-11-10 23:17:42 +00:00
Dan Willemsen
4e27364d65 Move some configuration from main.mk to config.mk am: cfabc42af9 -s ours am: 827554c1de
am: 826afd49fd

Change-Id: I2c35823527620c448b29888cbc7d6f01dc8a3982
2016-11-10 23:17:36 +00:00
Dan Willemsen
6dc0831d69 Merge changes I1bc291aa,Ib3ec8aa8 am: 0f185d7c3b
am: b63b2021d6

Change-Id: I747003c07cc763e44a0fded7ee2fc7ed9d39dd9c
2016-11-10 23:10:49 +00:00
Dan Willemsen
206a26306d Split (ninja|soong).mk into config and rule portions am: 04f53ed923
am: 0c3eaa8cf4

Change-Id: I947cecac51c77f8800981575324b341e2f4562a8
2016-11-10 23:10:43 +00:00
Dan Willemsen
826afd49fd Move some configuration from main.mk to config.mk am: cfabc42af9 -s ours
am: 827554c1de

Change-Id: If8fad8d067279ecff9a92bab5880196680093a51
2016-11-10 23:10:37 +00:00
Dan Willemsen
b63b2021d6 Merge changes I1bc291aa,Ib3ec8aa8
am: 0f185d7c3b

Change-Id: Ib6cf95a7946d91c48299c1ef5092a49c231fcc4e
2016-11-10 23:04:14 +00:00
Dan Willemsen
0c3eaa8cf4 Split (ninja|soong).mk into config and rule portions
am: 04f53ed923

Change-Id: I5766f8a60440669c6cda418a4423d159c9697bcb
2016-11-10 23:04:13 +00:00
Dan Willemsen
827554c1de Move some configuration from main.mk to config.mk
am: cfabc42af9  -s ours

Change-Id: I66cff53cf96698e22064c4087e0e777137b3ad80
2016-11-10 23:04:07 +00:00
Dan Willemsen
0f185d7c3b Merge changes I1bc291aa,Ib3ec8aa8
* changes:
  Split (ninja|soong).mk into config and rule portions
  Move some configuration from main.mk to config.mk
2016-11-10 22:41:24 +00:00
Dan Willemsen
cc54ba0452 Move some configuration from main.mk to config.mk am: 01a19a116f
am: 0a2b2784a6

Change-Id: Ifae685fa3de7f418dd1d4a2060c6637fac2b670d
2016-11-10 21:00:20 +00:00
Dan Willemsen
0a2b2784a6 Move some configuration from main.mk to config.mk
am: 01a19a116f

Change-Id: I4918aa3465bd650ca74e2500b81bf1fee2fbcdac
2016-11-10 20:54:17 +00:00
Sami Tolvanen
9a675c94d3 DO NOT MERGE: 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
Bug: 32789520
Change-Id: Ie0e044715a9c5ae8ba395e7d2ff9fbd7cffc0b4c
(cherrypicked from commit 433905f50e)
2016-11-10 18:18:09 +00:00
Dan Willemsen
01a19a116f Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.

Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk

Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.

Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
2016-11-10 03:32:37 +00:00
Chih-Hung Hsieh
76d0065ef8 Separate parallel_classify_warnings out of parse_input_file.
* Allow other callers of this module to:
  * pass any input stream to parse_input_file,
  * pass any warning_lines to parallel_classify_warnings,
  * call dump_csv or dump_html to get output.
* No output change.
* Capture and ignore signal.SIGTERM at the end,
  to avoid bad warning/error messages from the exit clean-up process.

Test: run warn.py build.log.
Change-Id: I1414797a536c0ee622e2a34c226578621be1ddab
2016-11-09 18:19:05 -08:00
Dan Willemsen
04f53ed923 Split (ninja|soong).mk into config and rule portions
So that an external tool can read the configuration using
dump-many-vars, and write out the soong.variables file while only
loading config.mk.

Also remove dumpvar-% from PARSE_TIME_MAKE_GOALS, since it's only used
with CALLED_FROM_SETUP / config.mk. This provides an easy way to test
this change as well.

Test: get_build_var NINJA
Test: get_build_var ANDROID_GOALS
Test: get_build_var NINJA_GOALS
Test: get_build_var KATI_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-NINJA_GOALS" get_build_var NINJA_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-KATI_GOALS" get_build_var KATI_GOALS
Test: MAKECMDGOALS="out/build-a.ninja dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: get_build_var SOONG_MAKEVARS_MK
Test: get_build_var SOONG_VARIABLES
Test: CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make -f build/core/config.mk out/soong/soong.variables showcommands
Test: Compare soong.variables from above, and before/after with `m`
Test: Compare out before/after with `m doesnotexist`
Test: `m dist doesnotexist`
Change-Id: I1bc291aa165297c930fe600067edad6ce4979210
2016-11-09 17:53:33 -08:00
Dan Willemsen
cfabc42af9 Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.

Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk

Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.

Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
2016-11-09 17:29:23 -08:00
Tao Bao
cd4f7c96c0 releasetools: Use java_path in sign_target_files_apks.py.
Prior to this CL, it was calling the hard-coded "java" although it was
accepting a "--java_path" option.

Also switch OPTIONS.java_args from string to list. Otherwise it won't
work when providing multiple args.

Bug: 32737832
Test: Specify "--java_path=" and "--java_args" when invoking
      sign_target_files_apks.py with "-v". Check the commands being
      called.
Change-Id: Id7ef98e778646d532027434de7fba9b7a104dbd0

(cherry picked from commit e95540e060)
2016-11-09 17:05:28 -08:00
Clay Murphy
ae9ee888d6 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" am: 98f15a70e9 am: 731df4f4f3
am: 74ea495250

Change-Id: Ia3ea0ed44a535e33700d57da4a53268f7921a06b
2016-11-09 21:41:57 +00:00
Clay Murphy
74ea495250 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" am: 98f15a70e9
am: 731df4f4f3

Change-Id: I921c3a3280c84ab98bc6bdde20b70a999946595f
2016-11-09 21:35:27 +00:00
Clay Murphy
731df4f4f3 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36"
am: 98f15a70e9

Change-Id: I19f35481e688b205790e4f2d817932422b72b93f
2016-11-09 21:29:57 +00:00
Clay Murphy
98f15a70e9 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" 2016-11-09 21:18:37 +00:00
Billy Lamberta
4d41e26a54 Creates a css nowrap class for non-breaking elements
in source.android.com
Test: build2stage 36

Change-Id: I467cc66d5e205b00ed188180140b1ae972e2ebad
2016-11-09 21:17:41 +00:00
Tao Bao
14b69f4ff5 Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1 am: dc04f93e39
am: 36f0b8daeb

Change-Id: I455bf056dd616c80b49e24a0d34885624fddb235
2016-11-08 23:53:27 +00:00
Tao Bao
36f0b8daeb Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1
am: dc04f93e39

Change-Id: Id86cdb3f7fdc771b9213d483d89dc6257a2225a5
2016-11-08 23:47:56 +00:00
Tao Bao
dc04f93e39 Merge "releasetools: Use java_path in sign_target_files_apks.py."
am: 4a71d500c1

Change-Id: I61400574ac3f7d29906ca571f497554631ecd72d
2016-11-08 23:42:26 +00:00
Dan Albert
988107d35c Support LOCAL_SDK_VERSION := current for NDK.
Test: Added a module using this and checked the link command line.
Bug: None
Change-Id: I3a55e4638340d8835c09ebc6a1440bece962d36e
2016-11-08 15:37:43 -08:00