Commit Graph

11356 Commits

Author SHA1 Message Date
Ian Pedowitz
6ff975bc3c Adding in some documentation to ensure files are updated as needed
am: fc0189fec2

Change-Id: I40d09f7a98f7b9fbe30f2b15c1e65dc6662e0352
2016-11-24 01:13:14 +00:00
Ian Pedowitz
fc0189fec2 Adding in some documentation to ensure files are updated as needed
Also pulls forward the comments added in 9a3d92f719
to nyc-mr2-dev

Bug: 33090697
Bug: 32608129
Test: None (comment only change)
Change-Id: Ic23d099767ad4c711bf2d3586cdefd626dec1ce0
2016-11-23 14:55:20 -08:00
Dan Albert
a7019e2493 Merge "Support LOCAL_SDK_VERSION := current for NDK." am: c7d2fe614e am: 6cac9ba834
am: 1cb992bc8e

Change-Id: If6643f5e842e50482d3ba5d34d3aa43f24d982f5
2016-11-18 19:16:14 +00:00
Dan Albert
1cb992bc8e Merge "Support LOCAL_SDK_VERSION := current for NDK." am: c7d2fe614e
am: 6cac9ba834

Change-Id: If64f88bee6162adada642ddedcf84747443068cc
2016-11-18 19:12:37 +00:00
Dan Albert
6cac9ba834 Merge "Support LOCAL_SDK_VERSION := current for NDK."
am: c7d2fe614e

Change-Id: Ibf9a4ffa74f5d05f68bd34db908fe4e5a67fe173
2016-11-18 19:09:36 +00:00
Treehugger Robot
c7d2fe614e Merge "Support LOCAL_SDK_VERSION := current for NDK." 2016-11-18 19:04:40 +00:00
Adam Seaton
df350bdb66 Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83 am: 223b79e356
am: 3b6ceb6dc1

Change-Id: I6c138ff2335abc94fa5b39a7f37967aa757171e1
2016-11-17 00:22:52 +00:00
Adam Seaton
3e3c6e34ae Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc am: 2e5e286112
am: 7a83d3131b

Change-Id: Idd390446f8a0c83b0dbbe9e89c0a3cc171c942a5
2016-11-17 00:22:47 +00:00
Adam Seaton
3b6ceb6dc1 Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5 am: 091dea5c83
am: 223b79e356

Change-Id: Ib8479d61177d014774b704d9cb416df303d1f766
2016-11-17 00:15:11 +00:00
Adam Seaton
7a83d3131b Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36 am: 6a954bbdbc
am: 2e5e286112

Change-Id: I79c96fb8f07692e546ec2004e5d034f7207b9112
2016-11-17 00:15:06 +00:00
Adam Seaton
223b79e356 Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61 am: b9085822a5
am: 091dea5c83

Change-Id: I02770ce32407d10f7de4e9ba4aa37458c77b5080
2016-11-17 00:08:11 +00:00
Adam Seaton
2e5e286112 Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e am: 6108f21d36
am: 6a954bbdbc

Change-Id: I3bc91aeb5674d2030634d88c960a2d84f4a84059
2016-11-17 00:08:06 +00:00
Adam Seaton
091dea5c83 Updating Security String to 2017-01-05 on nyc-dev am: 190129bc61
am: b9085822a5

Change-Id: I8230fa0c0c13b89274bab56a04b183e4c8b0ebe7
2016-11-17 00:00:40 +00:00
Adam Seaton
6a954bbdbc Updating Security String to 2017-01-01 on nyc-dev am: 202380f93e
am: 6108f21d36

Change-Id: Ibac521fa4d9e04c15e8178d9844c970257c11f58
2016-11-17 00:00:35 +00:00
Adam Seaton
b9085822a5 Updating Security String to 2017-01-05 on nyc-dev
am: 190129bc61

Change-Id: I806b3dfebb6dc08059313b979a435684341a759c
2016-11-16 23:53:39 +00:00
Adam Seaton
6108f21d36 Updating Security String to 2017-01-01 on nyc-dev
am: 202380f93e

Change-Id: Ib7310ca722b459e385478393c725391907f191f6
2016-11-16 23:53:34 +00:00
Adam Seaton
190129bc61 Updating Security String to 2017-01-05 on nyc-dev
b/32949407
2016-11-16 13:50:48 -08:00
Adam Seaton
202380f93e Updating Security String to 2017-01-01 on nyc-dev 2016-11-16 13:49:55 -08: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
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
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
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
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
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
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
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
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
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
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
Colin Cross
8b5532fa64 Merge "Export variable for device sanitize arch to Soong" am: d778640b0f am: 81e759e842
am: 168ff79efc

Change-Id: I3b14c8b2c2a057110ec0e88b91a4b9ba6bffe63d
2016-11-03 07:24:26 +00:00
Colin Cross
168ff79efc Merge "Export variable for device sanitize arch to Soong" am: d778640b0f
am: 81e759e842

Change-Id: I31e391e46e407359ea3c1dc4875839d0c38b2b6c
2016-11-03 07:21:27 +00:00
Colin Cross
81e759e842 Merge "Export variable for device sanitize arch to Soong"
am: d778640b0f

Change-Id: I2e98bdc476179ad990c2a3294fb6c7f56b21115f
2016-11-03 07:18:27 +00:00
Treehugger Robot
d778640b0f Merge "Export variable for device sanitize arch to Soong" 2016-11-03 07:12:54 +00:00
Ian Pedowitz
44d7414953 DO NOT MERGE Nougat MR2 is 7.1.2
am: 61be03b456

Change-Id: I10e090618d1342d03296f1345fabd1dfb4d94117
2016-11-03 06:52:14 +00:00
Dan Willemsen
c10172ef9c Merge "Update combined build.ninja to depend on Soong's build.ninja" am: 77ecb3347b
am: b4b655a7af

Change-Id: I0867e0d6402f95b04a034148562d731869f2a622
2016-11-03 02:48:11 +00:00
Dan Willemsen
b4b655a7af Merge "Update combined build.ninja to depend on Soong's build.ninja"
am: 77ecb3347b

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7
2016-11-03 02:45:12 +00:00
Dan Willemsen
d4b0504f85 Update combined build.ninja to depend on Soong's build.ninja
For Soong's build.ninja regeneration to work

Bug: 32574042
Test: m -j, add globbed file, m -j
Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
2016-11-02 16:24:52 -07:00
Colin Cross
2361842291 Export variable for device sanitize arch to Soong
Also renames the variable from SANITIZE_ARCH to SANITIZE_TARGET_ARCH,
and makes it only apply to the device.

Bug: 29498013
Test: No change to build.ninja files with m -j SANITIZE_TARGET=address
Change-Id: Ib5f6ab448f5d96d2426c983308136670f9a55b7b
2016-11-02 15:20:25 -07:00
Ian Pedowitz
61be03b456 DO NOT MERGE Nougat MR2 is 7.1.2
Fixes: 32335870
Change-Id: I2b0f7e0f9506704a391930f6f9c2a4cf9c550a7f
2016-11-01 14:42:43 -07:00