Commit Graph

2557 Commits

Author SHA1 Message Date
Steven Moreland
8fc756987e Merge "Add Treble as soong variable."
am: a9ec71f54f

Change-Id: I50eb0ba541a40244582b2e30d01e6595a65ad3be
2017-05-20 00:13:09 +00:00
Treehugger Robot
a9ec71f54f Merge "Add Treble as soong variable." 2017-05-20 00:05:51 +00:00
Steven Moreland
e24bc204c9 Add Treble as soong variable.
This exposes PRODUCT_FULL_TREBLE.

This is required so that we can add sane defaults to Treble code.

Test: manual
Bug: 38415912
Change-Id: Ia3ea4aeee799b998380a1600026075dab66286a3
2017-05-19 15:19:57 -07:00
Leo Li
c36e13ca3b Merge "Make factory functions in cc/prebuilt.go public. Test: refactoring CL."
am: 454fcd429d

Change-Id: I020f30fc556c3283aeddf1db8b91d16c832204c8
2017-05-18 19:05:38 +00:00
Treehugger Robot
454fcd429d Merge "Make factory functions in cc/prebuilt.go public. Test: refactoring CL." 2017-05-18 18:58:33 +00:00
Jeff Gaston
be5c4e2391 Merge "Revert "Disallow multiple build executions in parallel""
am: 43aecf67f4

Change-Id: I0cbf8515a4d7510ba4f4d1a2b78c9753353dd16e
2017-05-18 00:50:50 +00:00
Jeff Gaston
43aecf67f4 Merge "Revert "Disallow multiple build executions in parallel"" 2017-05-18 00:39:51 +00:00
Jeff Gaston
be9cd1192b Revert "Disallow multiple build executions in parallel"
This reverts commit 7db68be5e1.

Reason for revert: postsubmit build encountered a failure

Change-Id: I3c7304114f712d78f79afb1b9d84dc2eadcbc876
2017-05-18 00:34:48 +00:00
Jeff Gaston
8c33bc3de4 Merge "Disallow multiple build executions in parallel"
am: 90d7ceba9e

Change-Id: I72125292d5c1ad0f86a4879f8ea8d8093340a5f4
2017-05-17 23:46:15 +00:00
Treehugger Robot
90d7ceba9e Merge "Disallow multiple build executions in parallel" 2017-05-17 23:41:34 +00:00
Christopher Ferris
3dc0ed282a Merge "soong: use optimal FPU on Cortex-A15"
am: 10559e4648

Change-Id: I3b2baf9757c8a195128c264fd142a11c8ebb79d0
2017-05-17 23:39:15 +00:00
Christopher Ferris
10559e4648 Merge "soong: use optimal FPU on Cortex-A15" 2017-05-17 23:33:57 +00:00
Leo Li
74f7b97d3f Make factory functions in cc/prebuilt.go public.
Test: refactoring CL.

Change-Id: Icf4628df082d2b5a41a9108f85cb73dab42839ab
2017-05-17 16:33:20 -07:00
Colin Cross
f0dc9d4704 Merge "Dedup exported flags from dependencies"
am: d17602b76c

Change-Id: I12cc86e7a6c7cd7b37c6c5542d7073e3799562f8
2017-05-17 23:10:43 +00:00
Treehugger Robot
d17602b76c Merge "Dedup exported flags from dependencies" 2017-05-17 22:52:44 +00:00
Colin Cross
dd84e056ed Dedup exported flags from dependencies
Soong command lines have gotten very long due to hidl modules
reexporting lots of libraries.  Dedup the include dir flags.

Test: m -j checkbuild
Change-Id: I6ada1251012da42344e2c00ae66001a649023d2c
2017-05-17 14:22:22 -07:00
Jake Weinstein
5916657a96 soong: use optimal FPU on Cortex-A15
* Cortex-A15 supports VFPv4 instructions

Test: make otapackage
Test: Built angler with 32 bit variant set to cortex-a15.
Test: Boot this version of the angler, ran bionic unit tests.
Change-Id: I94f00c9486ece201aa2c230308b9f90b0209dc4a
2017-05-17 14:11:33 -07:00
Nan Zhang
da8c39690c Add python_test_host module.
am: 5323f8e32f

Change-Id: I85cf54bd3fe15e1849137742953e23085739974d
2017-05-17 20:38:02 +00:00
Nan Zhang
5323f8e32f Add python_test_host module.
bug: 31676493
Test: created py_test modules in real folder. and ran 'mma'.
Change-Id: I22aa2fad74b11e4a31ea7a4c4a4f0ea64cd3fc94
2017-05-17 11:26:00 -07:00
Jeff Gaston
7db68be5e1 Disallow multiple build executions in parallel
Bug: 36698966
Test: run two 'make -j' executions in parallel in each of two terminals

Change-Id: Ief91391fe1f0fdbf9655cc0ba1298e353396d705
2017-05-16 17:47:09 -07:00
Nan Zhang
cd2338ec78 Merge "Fix the issue "\n" didn't get interpreted properly."
am: 2c13abc95e

Change-Id: I8c0dbf8147007d39ba36f711885d4e25b2c83b70
2017-05-17 00:35:27 +00:00
Treehugger Robot
2c13abc95e Merge "Fix the issue "\n" didn't get interpreted properly." 2017-05-17 00:31:08 +00:00
Nan Zhang
270051119a Fix the issue "\n" didn't get interpreted properly.
Added params to WriteFile rule that allow users to turn on the
specific 'echo' options, such as "enable the interpretation of backslash
escapes".

Bug: b/38261000
Test: tested with real data files.
Change-Id: I5145056b5c2522a3a72b9436055ec95d2fbd94c0
2017-05-16 15:10:29 -07:00
Dan Willemsen
6cd2b46177 Merge changes I9512642d,I6548889c,I8db5198f
am: e121bbbb3b

Change-Id: Ib20494bd4f449cc27cc7cb7fcb6bbea7efd29c57
2017-05-16 19:59:25 +00:00
Treehugger Robot
e121bbbb3b Merge changes I9512642d,I6548889c,I8db5198f
* changes:
  Add build_test.sh, split common parts of soong_ui.bash
  Allow specifying a build variant
  Improve multiproduct_kati output
2017-05-16 19:45:08 +00:00
Dan Willemsen
1b6f4f9617 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
am: 63b599a7a0

Change-Id: Ic003bdcf9cb8ea0d8ee12d89c1811bb09ccaaac9
2017-05-16 18:10:00 +00:00
Dan Willemsen
caa35537b4 Move version checking from Make into soong_ui
am: db8457cfec

Change-Id: Ic13da3d6289f58f240fb96b89d14cf32c5510d53
2017-05-16 18:09:55 +00:00
Dan Willemsen
aa63859d0b Move clean/clobber to soong_ui
am: 0b73b4bc37

Change-Id: I272843824665bbfdd320c00a7eba963111498ad9
2017-05-16 18:09:48 +00:00
Dan Willemsen
63b599a7a0 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
* changes:
  Move auto installclean to soong_ui
  Move version checking from Make into soong_ui
  Move clean/clobber to soong_ui
2017-05-16 18:02:04 +00:00
Christopher Ferris
22cfac2a33 Merge "soong: add cortex-a73 to microarchitecture list"
am: 2dc77f7275

Change-Id: I6a8813a9d20a0fcee2f690f5f3342b1c29d93d48
2017-05-16 17:23:31 +00:00
Christopher Ferris
2dc77f7275 Merge "soong: add cortex-a73 to microarchitecture list" 2017-05-16 17:14:45 +00:00
Jeff Gaston
748e0eddc1 Merge "Support for LOCAL_AIDL_INCLUDES in androidmk"
am: b4a3288be8

Change-Id: I04f15fdef1b1ab5393434c48a5c348f502e67f5c
2017-05-16 01:12:28 +00:00
Jeff Gaston
b4a3288be8 Merge "Support for LOCAL_AIDL_INCLUDES in androidmk" 2017-05-16 01:06:34 +00:00
Dan Willemsen
7ed05d634d Merge "Revert "Revert "Ensure environment dependencies are correct"""
am: 04b830f133

Change-Id: Ie222f2c6f81ad193e608abc8da09fadb289e82ec
2017-05-16 00:31:56 +00:00
Dan Willemsen
0df1517259 Add build_test.sh, split common parts of soong_ui.bash
Move common microfactory functions to cmd/microfactory/microfactory.bash
so that they can be used to build both soong_ui for normal build and
multiproduct_kati for build system tests.

Test: m -j
Test: build/soong/build_test.bash
Change-Id: I9512642d846ce54d05a027b6d33a2b3029b3f90b
2017-05-15 17:26:52 -07:00
Jeff Gaston
0669b93b74 Merge "Clarify paths.go somewhat"
am: bdb02bd334

Change-Id: I4d900bfdf4193413f29410f9e4778e88fc32d2ae
2017-05-16 00:25:55 +00:00
Treehugger Robot
04b830f133 Merge "Revert "Revert "Ensure environment dependencies are correct""" 2017-05-16 00:25:09 +00:00
Treehugger Robot
bdb02bd334 Merge "Clarify paths.go somewhat" 2017-05-16 00:20:29 +00:00
Dan Willemsen
5ed900be48 Allow specifying a build variant
Test: multiproduct_kati --variant userdebug
Change-Id: I6548889caf868cad6270110c038753d029247572
2017-05-15 16:34:46 -07:00
Dan Willemsen
02781d59bb Move auto installclean to soong_ui
This way kati won't need to be run as often (either initially, or when
switching products with the same device).

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: lunch aosp_arm-eng; m -j blueprint_tools; lunch full-eng; m -j blueprint_tools; <repeat>
Change-Id: Ie9fca3c8f1dd412459ea47c7090c7c5fdb0bcf6e
2017-05-15 16:26:21 -07:00
Dan Willemsen
db8457cfec Move version checking from Make into soong_ui
When kati keeps state around, it has to regenerate the ninja file every
time the state is changed. So move the java version checking into
soong_ui, where we can parallelize it with other operations instead of
only checking it occasionally.

Bug: 35970961
Test: Put java7 in PATH, m -j
Test: Put java8-google in PATH, m -j
Test: Put a space in TOP, m -j
Test: OUT_DIR=<case-preserving fs> m -j
Test: OUT_DIR=<path with space> m -j
Test: DIST_DIR=<path with sapce> m -j
Change-Id: I3245c8dd6d856240d17d54cb05d593dc9df71a27
2017-05-15 16:21:33 -07:00
Jake Weinstein
6600a44072 soong: add cortex-a73 to microarchitecture list
* Was missed in I3325f60add7f424f8cca53c22919fc481ef5e787

Change-Id: I24d1ef38922cb8f46c9136018cce6a22293ca95e
2017-05-15 18:27:12 -04:00
Dan Willemsen
a4e43a77d8 Improve multiproduct_kati output
It now uses the same output style as ninja, overwriting status lines in
smart terminals.

Test: multiproduct_kati
Test: multiproduct_kati | cat
Change-Id: I8db5198ffdc5ebc5503241ac492379753d92978e
2017-05-15 15:24:10 -07:00
Dan Willemsen
6606872bf6 Revert "Revert "Ensure environment dependencies are correct""
This reverts commit 4068a5db6c.

Now the Mac xcode-select and xcrun goes through Config.HostSystemTool,
which will grab $PATH through Config.Getenv

Test: m -j (on mac)
Change-Id: I2632c4fdb2ec961e59944cf02ff165e0fd3c869d
2017-05-15 15:22:45 -07:00
Christopher Ferris
bc26723a49 Add cortex-a73 support.
am: 6df46f5d93

Change-Id: I303b9dd3ad742f81f980f6f7ac45f0270e0f323e
2017-05-15 22:09:20 +00:00
Dan Willemsen
0b73b4bc37 Move clean/clobber to soong_ui
So that we don't have to load up all the makefile state just to remove
the output directory.

Starting from a completely empty out directory:
 kati:    16s
 soong_ui: 2.0s

From a minimal out directory (m -j blueprint_tools):
 kati:     3.8s
 soong_ui: 0.4s

Test: m -j clean
Test: m -j clobber
Change-Id: Ibeec6fbfa29387750342a752a55336caca4b3992
2017-05-15 14:46:04 -07:00
Christopher Ferris
6df46f5d93 Add cortex-a73 support.
Also, update flags for cortex-a53.

Bug: 37647380

Test: Built target with cortex-a73 for both 32 bit/64 bit.
Test: Built target with cortex-a53.cortex-a57 for both 32 bit/64 bit.
Test: Ran bionic unit tests, ran art target tests.

(cherry picked from commit 1d9aa26d44)

Change-Id: I3325f60add7f424f8cca53c22919fc481ef5e787
2017-05-15 12:44:58 -07:00
Jeff Gaston
fa833bb6d5 Support for LOCAL_AIDL_INCLUDES in androidmk
Now it converts to:
aidl: {
  include_dirs: [
    "...",
  ]
}

Bug: 37747936
Test: run androidmk against an Android.mk file having LOCAL_AIDLE_INCLUDES
Change-Id: If9f4c3ee9969610f1e0e0f147ee6a70102b63edc
2017-05-15 11:46:04 -07:00
Jeff Gaston
734e3809ad Clarify paths.go somewhat
Bug: 35562758
Test: make

Change-Id: I4cf05ffdd0962186f490467829e3576b4e269c47
2017-05-15 11:31:48 -07:00
Dan Willemsen
0bb78558c7 Clean OUT_DIR
am: 02f3add3a3

Change-Id: Iadb7fd49f80e8bcb34cb563d778b21e578f7969f
2017-05-12 22:38:21 +00:00