Commit Graph

32219 Commits

Author SHA1 Message Date
Dan Willemsen 323efd3035 Add basic VNDK support in Make
am: bab0fa6928

Change-Id: Ie2bc9062891b2f8000b1db471b27f58c74190e92
2016-11-29 20:42:32 +00:00
Dan Willemsen 28cf7d49ab Remove GLOBAL_LD_DIRS
am: e5836c4bb0

Change-Id: I6683ed19bff601075e82065c5c1dc783d62249b4
2016-11-29 20:42:26 +00:00
Dan Willemsen bab0fa6928 Add basic VNDK support in Make
Add BOARD_VNDK_VERSION and LOCAL_USE_VNDK to specify the version of the
VNDK that will be used globally, and whether to use the VNDK on a module
basis.

If the board is using the VNDK:

* LOCAL_COPY_HEADERS may only be used by modules defining LOCAL_USE_VNDK
* LOCAL_USE_VNDK modules will compile against the NDK headers and stub
  libraries, but continue to use the platform libc++.
* LOCAL_USE_VNDK modules will not have the global includes like
  system/core/include, but it will use device-specific kernel headers.

This change does not attempt to enforce any linking constraints, that
will come in a later patch.

Test: out/build-aosp_arm.ninja is identical before/after
Change-Id: Icce65d4974f085093d500b5b2516983788fe2905
2016-11-28 13:46:17 -08:00
Dan Willemsen e5836c4bb0 Remove GLOBAL_LD_DIRS
The last user of this was the NDK, which has been using full paths in
binary.mk. So remove it.

Test: lunch aosp_arm-eng; m -j native
Change-Id: Ida2523a2d19131ee3ef005edb3e5bcf830710b11
2016-11-28 13:46:17 -08:00
Tao Bao 5cd53f7e22 Merge "Makefile: Pack verity_verifier into otatools.zip."
am: 31543713fc

Change-Id: I94587dc4f80edd61d5d414742513c4360609259f
2016-11-28 18:13:45 +00:00
Tao Bao 3b35352e1b Makefile: Pack verity_verifier into otatools.zip.
am: 7f02f3413b

Change-Id: Ib9c73dd16016b582dbaf2c40ebfc9b20c1adabe3
2016-11-28 18:13:43 +00:00
Tao Bao 31543713fc Merge "Makefile: Pack verity_verifier into otatools.zip." 2016-11-28 18:04:04 +00:00
Tao Bao 7f02f3413b Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.

Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
2016-11-22 15:36:57 -08:00
Ian Rogers 1eef968704 Merge "Update warn.py for new Error Prone diagnostics"
am: 7ed3af23a8

Change-Id: Iae1dec6c0b48be23d874c01b9d87627bbf0c0caf
2016-11-22 18:50:21 +00:00
Ian Rogers 7ed3af23a8 Merge "Update warn.py for new Error Prone diagnostics" 2016-11-22 18:43:51 +00:00
Nick Glorioso 8a7b25c736 Update warn.py for new Error Prone diagnostics
Test: Local build, tee'd to file, ran warn.py and checked output HTML
Change-Id: Iee3386e88c73e4b8e0a1fcc60105ee5fb86e3cb0
2016-11-22 10:35:07 -08: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
Andreas Gampe 2a2442c6f2 Merge "Build: Bring back SDK dependencies"
am: eb06c77b80

Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
2016-11-18 02:57:28 +00:00
Andreas Gampe eb06c77b80 Merge "Build: Bring back SDK dependencies" 2016-11-18 02:53:29 +00:00
Andreas Gampe ff00c5d78f Build: Bring back SDK dependencies
Temporarily re-add SDK dependencies to runtime_libart.mk.

Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
2016-11-17 18:21:36 -08:00
Andreas Gampe bd7d5aea2a Merge "Build: Refactor and clean up runtime_libart"
am: 020f5275d5

Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
2016-11-18 01:32:20 +00:00
Treehugger Robot 020f5275d5 Merge "Build: Refactor and clean up runtime_libart" 2016-11-18 01:25:53 +00:00
William Roberts c06559eb7b Merge "fs_config: move sort to be consistent with other sort"
am: 052a01958c

Change-Id: If18ab459d74e20f96db56d80ecdbf94580583463
2016-11-18 00:57:15 +00:00
Treehugger Robot 052a01958c Merge "fs_config: move sort to be consistent with other sort" 2016-11-18 00:29:53 +00:00
William Roberts 2088e57ed8 Merge "fs_config: correct README"
am: 4baaf905ee

Change-Id: I1a3fa8a296608205a29efb94c32fbfd14d4844f2
2016-11-17 23:42:52 +00:00
Andreas Gampe 349b67c6ba Merge "Build: Add agent library to default packages"
am: 709aaa5aea

Change-Id: I61e55b948838d8845d04802e87d435ac8b9f9b3c
2016-11-17 23:42:38 +00:00
Treehugger Robot 4baaf905ee Merge "fs_config: correct README" 2016-11-17 23:30:51 +00:00
Treehugger Robot 709aaa5aea Merge "Build: Add agent library to default packages" 2016-11-17 23:17:09 +00:00
Andreas Gampe 9a3e5ac355 Build: Refactor and clean up runtime_libart
Split out dependencies and removes some transitives. In preparation
for moving the modules.

Test: m
Test: Device boots
Change-Id: I7cdccd178eef9a625607a74ba8496651591e4cb4
2016-11-17 14:37:11 -08:00
William Roberts 8cb6a1893e fs_config: move sort to be consistent with other sort
Test: Checked diff and hash of before and after output files, same.
Test: Tested build for basic boot and functionality.
Change-Id: If7806427e3a2a9ddb7a2c9aa14e1e4f9bf696acf
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-11-17 14:18:38 -08:00
William Roberts db616f0091 fs_config: correct README
Testing on earlier versions of Python indicated an error in the
README. Python's ConfigParser prior to version 3.2 allows for
sections within the same file to override later sections.
Correct the README.

Test: Checked diff and hash of output file from before and after.
Change-Id: Ifd3f78414b4803e4b74decb1fdf6816d4902c4a2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-11-17 13:10:55 -08:00
Andreas Gampe cd82dceb3c Build: Add agent library to default packages
Add libopenjdkjvmti to ART dependencies.

Bug: 31455788
Test: m && ls $OUT/system/lib/libopenjdkjvmti.so
Change-Id: Iccf35f04548d74df87ec05f2cb555c1db9d137c6
2016-11-17 13:05:13 -08: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 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 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 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 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 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 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 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