Commit graph

30136 commits

Author SHA1 Message Date
Colin Cross
70e0ac6bc1 Remove HOST_PREFER_32_BIT
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.

Change-Id: I874f89c7d1e9cd8c9d4c879048d81a4362ce4dce
2016-09-02 13:20:52 -07:00
Treehugger Robot
a5b02ff1ef Merge "Canonicalize mmm path" 2016-09-01 17:04:50 +00:00
Colin Cross
b7a12806b1 Merge "Don't double-wrap with gomacc" 2016-09-01 15:59:38 +00:00
Colin Cross
4bfae06e71 Canonicalize mmm path
Canonicalize the mmm path relative to the top level before creating the
MODULES-IN-dir target.  Fixes cd frameworks/base; mmm -j .

Test: cd frameworks/base; mmm -j
Change-Id: If7bc321e8a87b76121f876bf4bc296b0f9b80578
2016-08-31 22:00:03 -07:00
Colin Cross
44303e9f26 Merge "Create more shortcut phony targets" 2016-08-31 21:16:22 +00:00
Colin Cross
44005d41dc Don't double-wrap with gomacc
config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER.  Only export it from make so gomacc doesn't appear twice on
the command line.

Bug: 31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
2016-08-31 13:51:16 -07:00
Colin Cross
753ed863c5 Merge "Enable goma in soong" 2016-08-31 20:08:57 +00:00
Colin Cross
5a5befb7c0 Enable goma in soong
Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.

Bug: 31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
2016-08-31 09:48:21 -07:00
Dan Willemsen
2e5dc07c1f Merge "Simplify Soong bootstrapping" 2016-08-31 16:06:35 +00:00
Dan Willemsen
0533e4df40 Simplify Soong bootstrapping
Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.

Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
2016-08-31 00:58:12 -07:00
Colin Cross
b43204b2ac Create more shortcut phony targets
Create shortcut phony targets for the host and device halves of
modules.

Change-Id: I1cf3a49118db830d78a1b83b2177715175949871
2016-08-30 16:16:32 -07:00
Treehugger Robot
049dd57872 Merge "Check USE_GOMA consistently" 2016-08-29 20:36:00 +00:00
Pirama Arumuga Nainar
3500ddfe1b Merge "Switch to prebuilt clang-3217047" 2016-08-29 19:38:34 +00:00
Dan Willemsen
937cef48eb Check USE_GOMA consistently
Currently, the only way to properly disable goma is to unset USE_GOMA.
If you set USE_GOMA=false, we won't turn on goma, but we'll pass -j500
to ninja.

Test: USE_GOMA={x,false} m -j48 showcommands (inspect)
Change-Id: I6b327d08ebadbe614a3bf7646fd597054bbfaaa2
2016-08-27 18:33:11 -07:00
Treehugger Robot
c6bada8acd Merge "Identify modules ready to be converted to Soong" 2016-08-26 22:37:19 +00:00
Pirama Arumuga Nainar
6290aac57a Switch to prebuilt clang-3217047
Bug: http://b/30421084
Change-Id: I41acd016992a0c5043b6ea018f205fad44c88b9e
Test: Tested build, boot and common usage for several devices in AOSP
and internal branch.
2016-08-26 21:57:29 +00:00
Dan Willemsen
fc92fb2b9b Identify modules ready to be converted to Soong
The output will be in the `m dist` results as soong_to_convert.txt, or
can be built using:

  $ m $OUT/soong_to_convert.txt

The output is a list of modules that are probably ready to convert to
Soong:

  # Blocked on Module (potential problems)
           283 libEGL (srcs_dotarm)
           246 libicuuc (dotdot_incs dotdot_srcs)
           221 libspeexresampler
           215 libcamera_metadata
               ...
             0 zram-perf (dotdot_incs)

The number at the beginning of the line shows how many native modules
depend on that module.

All of their dependencies have been satisfied, and any potential
problems that Make can detect are listed in parenthesis after the
module:

  dotdot_srcs: LOCAL_SRC_FILES contains paths outside $(LOCAL_PATH)
  dotdot_incs: LOCAL_C_INCLUDES contains paths include '..'
  srcs_dotarm: LOCAL_SRC_FILES contains source files like <...>.c.arm
  aidl: LOCAL_SRC_FILES contains .aidl sources
  dbus: LOCAL_SRC_FILES contains .dbus-xml sources
  objc: LOCAL_SRC_FILES contains Objective-C sources
  proto: LOCAL_SRC_FILES contains .proto sources
  rs: LOCAL_SRC_FILES contains renderscript sources
  vts: LOCAL_SRC_FILES contains .vts sources

Not all problems can be discovered, but this is a starting point.

Change-Id: I45674fe93fd267d4d1fb0bc3bc9aa025e20c5ac6
2016-08-26 13:33:31 -07:00
Treehugger Robot
fe3163400e Merge "Export TARGET_PREFER_32_BIT_EXECUTABLES to soong" 2016-08-26 00:02:34 +00:00
Colin Cross
76c4533899 Export TARGET_PREFER_32_BIT_EXECUTABLES to soong
Change-Id: I1427d88c7539c5ed0c4c238bad4a28f73d29ef0f
2016-08-25 14:49:17 -07:00
Colin Cross
6f1cf129f2 Merge "Install symlinks when using shortcut phony targets" 2016-08-25 20:39:31 +00:00
Chih-hung Hsieh
a9ee94f441 Merge "Suppress clang-tidy checks in frameworks/compile/mclinker." 2016-08-25 02:24:32 +00:00
Colin Cross
6d34b61bd3 Install symlinks when using shortcut phony targets
Make symlinks an order-only dependency of the module name phony target
so that they get installed with make module or make MODULES-IN-path.

Test: mmma -j art/dalvikvm, remove symlink in $OUT and retry
Change-Id: Iae472a1c8fa1e8386cc9556cfe819bd4fca99428
2016-08-24 15:24:29 -07:00
Treehugger Robot
a7adc06e68 Merge "Don't regenerate userdata.img when signing" 2016-08-24 21:10:08 +00:00
Chih-hung Hsieh
b8f6f5dced Merge "Recognize new warning messages." 2016-08-24 20:56:36 +00:00
Chih-Hung Hsieh
01530a6ff2 Recognize new warning messages.
* Generalize regular expression to match new warning messages.
* Remove old unused pattern.

Change-Id: I54f2e5bdb255b290cb3751ba56558f5fe8d7245e
Test: Run warn.py with build.log
2016-08-24 20:53:27 +00:00
Tianjie Xu
b48589af57 Don't regenerate userdata.img when signing
The userdata.img and cache.img entries are not useful in signed builds;
because fastboot doesn't look at these two entries in the *img.zip when
flashing a device. And they aren't used elsewhere. Therefore, skip
building the image files for them when signing the target files with
sign_target_files_apks. Also, add an option "--is_signing" to avoid
adding these two images when we call add_img_to_target_files.

Change-Id: I39ba91a86d9a856d7d01771f6d1403dbf21f2011
Test: Run sign_target_files_apks on a target file and userdata/cache.img doesn't not generate.
Bug: 30642470
2016-08-24 12:50:35 -07:00
Yohann Roussel
1d7e0f2c74 Merge "Allow selection of prebuilts min sdk"
am: 624619d4d0

Change-Id: I54df2acb3003c0222b3f3d909d3f9c80dfda493d
2016-08-24 09:50:29 +00:00
Yohann Roussel
624619d4d0 Merge "Allow selection of prebuilts min sdk" 2016-08-24 09:39:30 +00:00
Chih-Hung Hsieh
b9ea8d191d Suppress clang-tidy checks in frameworks/compile/mclinker.
Too many warnings need to wait for upstream changes.
Test: build with WITH_TIDY=1.

Change-Id: I0b1272049ad757670182668db130512a538b3096
2016-08-23 11:07:19 -07:00
Casey Dahlin
14aa63a52a Merge "List partition_table.bpt as an output of running bpttool"
am: aba93cf736

Change-Id: Ib986d3551a2bfff5ce813139380378b11dd84d82
2016-08-23 00:56:19 +00:00
Treehugger Robot
aba93cf736 Merge "List partition_table.bpt as an output of running bpttool" 2016-08-23 00:41:52 +00:00
Casey Dahlin
04d15dd9a3 List partition_table.bpt as an output of running bpttool
Change-Id: I8bb1e03e451bf148e421ecac346bf20ce5d4695b
Test: Verified builds can now depend on partition_table.bpt
Bug: 30971990
2016-08-22 16:00:39 -07:00
Tao Bao
cfab69eb32 Merge "releasetools: Allow creating target_files with ZIP64."
am: 794c69e603

Change-Id: I94eac12de16cac4e4034d933f83fbfa61ca20591
2016-08-22 19:09:55 +00:00
Treehugger Robot
794c69e603 Merge "releasetools: Allow creating target_files with ZIP64." 2016-08-22 18:59:13 +00:00
Tao Bao
9c84e50f4c releasetools: Allow creating target_files with ZIP64.
add_img_to_target_files.py fails when the target_files.zip is over 4GiB
when adding IMAGES/ folder. Specify the flag to allow creating
target_files.zip with ZIP64 extension.

Other zip artifacts (-img.zip, -ota.zip etc) remain in non-ZIP64 format.
zip2zip is not affected, which still creates non-ZIP64 zips even when
copying from target_files in ZIP64.

Bug: 30961841
Test: "make dist" with large system image and check the artifacts.

Change-Id: I0568745f01ef8f0239081f783eac92288d4fdd84
2016-08-22 10:40:24 -07:00
Yohann Roussel
5960c54664 Allow selection of prebuilts min sdk
Bug: 30966099

Change-Id: I55128d5a321bd65b4e12b90afbf7efe8ccb35829
2016-08-22 09:54:32 +02:00
Chih-Hung Hsieh
94a2c5f6b7 Merge "Clarify default tidy check lists."
am: ce4c49c2f2

Change-Id: If0641d286d6f1fefa871a18c21282f4fcd10d8a1
2016-08-17 17:48:56 +00:00
Dan Willemsen
faac87dd9a Merge "Support dist-ing the userdatatarball"
am: 9abbeb3d8f

Change-Id: I0dac58c2eed164247fe595da6897ff00f0786e18
2016-08-17 17:48:54 +00:00
Chih-Hung Hsieh
34c8c0ac33 Merge "Remove spaces in tidy check list."
am: e7bca12466

Change-Id: I852d42992bc1ddb0a17dd1dcf03cf25f1d114552
2016-08-17 17:48:52 +00:00
Treehugger Robot
ce4c49c2f2 Merge "Clarify default tidy check lists." 2016-08-17 04:56:07 +00:00
Dan Willemsen
9abbeb3d8f Merge "Support dist-ing the userdatatarball" 2016-08-17 00:58:18 +00:00
Treehugger Robot
e7bca12466 Merge "Remove spaces in tidy check list." 2016-08-17 00:44:50 +00:00
Dan Willemsen
69af2e4102 Support dist-ing the userdatatarball
So that we can get to the contents of userdata from the build server
without extracting the image.

Bug: 27719200
Test: m userdatatarball dist
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
2016-08-16 23:41:50 +00:00
Chih-Hung Hsieh
ba646253ce Remove spaces in tidy check list.
This will allow spaces in LOCAL_TIDY_CHECKS.

Bug: http://b/27779618
Change-Id: I6f9b133220e49b2581a06d2fd9083a1d6b7badca
Test: build with WITH_TIDY=1.
2016-08-16 16:27:30 -07:00
Chih-Hung Hsieh
97032ccda3 Clarify default tidy check lists.
* Sort all enabled and disabled checks.
* Disable google-default-arguments for external and vendor projects.

Bug: http://b/27779618
Change-Id: I59e6eaf84fddf54bd89eb71a2189d73b64968057
Test: build with WITH_TIDY=1.
2016-08-16 15:47:56 -07:00
Dan Willemsen
9fc9cac0ac Merge "Fix GET-INSTALL-PATH to work with Soong"
am: 6b9aa6938d

Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
2016-08-15 21:17:33 +00:00
Dan Willemsen
6b9aa6938d Merge "Fix GET-INSTALL-PATH to work with Soong" 2016-08-15 21:07:53 +00:00
Tianjie Xu
bf5e3d168d Merge "Replace META/care_map.txt when signing target files"
am: 7b11cacbba

Change-Id: Ia8e888a0f330d00f6518e352356ca480819586db
2016-08-12 18:06:41 +00:00
Tianjie Xu
7b11cacbba Merge "Replace META/care_map.txt when signing target files" 2016-08-12 18:01:56 +00:00
Dan Willemsen
53e3899222 Fix GET-INSTALL-PATH to work with Soong
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.

Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
2016-08-12 05:10:51 +00:00