Commit Graph

5960 Commits

Author SHA1 Message Date
Logan Chien
6eaae1a84a Merge changes I406c5bef,Ibde685d7,I1c09412d
am: 45d4f09f2f

Change-Id: Ibea5c7e83e1672f96ebae78d5ac5c6b4c65cfb2b
2018-03-16 02:11:44 +00:00
Logan Chien
45d4f09f2f Merge changes I406c5bef,Ibde685d7,I1c09412d
* changes:
  Allow VNDK extensions under vendor or device
  Add unit tests for android/neverallow.go
  Extract failIfErrored() to android/testing.go
2018-03-16 01:57:31 +00:00
Colin Cross
a717c1e346 Merge "Update turbine command line flags"
am: 1eb9f090e0

Change-Id: Ia750d0f460c4246cb3203b04dd713e7a3580f859
2018-03-15 22:53:58 +00:00
Colin Cross
1eb9f090e0 Merge "Update turbine command line flags" 2018-03-15 22:39:28 +00:00
Logan Chien
af29bada75 Allow VNDK extensions under vendor or device
This commit allows VNDK extensions (vndk.enabled:true and vendor:true)
to reside under vendor/* or device/*.  VNDK extensions will be installed
into /vendor/lib[64]/vndk[-sp].  It is reasonable for their source being
under vendor/* or device/*.

Bug: 74506774
Test: lunch aosp_walleye-userdebug && make  # runs unit tests
Change-Id: I406c5bef10f5c549371dd978b8ecc16c65a7af4b
2018-03-15 11:02:38 +08:00
Logan Chien
ee97c3ed75 Add unit tests for android/neverallow.go
Bug: 74506774
Test: lunch aosp_walleye-userdebug && make  # runs unit tests
Change-Id: Ibde685d7213713be219681cb039ad58a43d9c377
2018-03-15 11:02:38 +08:00
Logan Chien
4203971351 Extract failIfErrored() to android/testing.go
Bug: 74506774
Test: lunch aosp_walleye-userdebug && make  # runs unit tests
Change-Id: I1c09412d5988dca2cc1c5f041893b313ab1c163a
2018-03-15 11:02:38 +08:00
Colin Cross
924a0aa7d5 Update turbine command line flags
The latest version of turbine requires a -- after the javac
options, and uses multiple --bootclasspath arguments instead
of a javac-style colon separated list.

Test: m javac-check
Bug: 74339924
Change-Id: Ib7096294a43e9bd30abc36751299bfac7879f765
2018-03-13 22:22:49 -07:00
Dan Willemsen
bb8f0eed0f Add DistPath to reference the dist folder
am: bc0c509267

Change-Id: I687725e1bcc6d859a1232680224f8d4ff1e19a1d
2018-03-14 00:26:28 +00:00
Dan Willemsen
f34acc112e Switch PackageContext functions to take a ctx
am: 54daaf0371

Change-Id: I10fc75e9be9aaa930f05bb0a559aceb87a056120
2018-03-14 00:26:23 +00:00
Dan Willemsen
bc0c509267 Add DistPath to reference the dist folder
Instead of open-coding the logic of whether there is one, or where to
find it.

Test: diff out/soong/build.ninja without dist
Test: diff out/soong/build.ninja with dist specified
Change-Id: Ia3f1ef335e2d6e2175343338d04867d778a50300
2018-03-12 15:48:30 -07:00
Dan Willemsen
54daaf0371 Switch PackageContext functions to take a ctx
So that the Path and similar functions can be used directly, without
manually adding something like configErrorWrapper (it just uses it all
the time now).

Test: out/soong/build.ninja is identical
Change-Id: I8cb524b09a84d0b8357d7c3501c71270af411e17
2018-03-12 15:48:26 -07:00
Dan Willemsen
567eda6a7d Remove obsolete Brillo variable
am: a052599bb6

Change-Id: Iace45d40354704ad0ab9319fb7adcfb3484a7b67
2018-03-12 21:54:09 +00:00
Dan Willemsen
a052599bb6 Remove obsolete Brillo variable
Test: none
Change-Id: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e
2018-03-10 15:29:03 -08:00
Dan Willemsen
f1f4fca756 Merge "Use xz prebuilt"
am: 9c6bc37da1

Change-Id: I2c09ecff34403ca2649c16f7e1fb5e517dfc293f
2018-03-10 03:06:00 +00:00
Treehugger Robot
9c6bc37da1 Merge "Use xz prebuilt" 2018-03-10 03:00:29 +00:00
Nan Zhang
7cc98e9af5 Merge "Remove timestamp based filelist file for tracking Python dependencies"
am: 8b00247b66

Change-Id: Ib8213c35e21fbb56837d4f9a3cc78228fbedf8f1
2018-03-10 00:52:00 +00:00
Treehugger Robot
8b00247b66 Merge "Remove timestamp based filelist file for tracking Python dependencies" 2018-03-10 00:42:37 +00:00
Nan Zhang
cc2631e883 Merge "Fetch generated srcs from java libs for droiddoc."
am: 0b9be36339

Change-Id: I9c1d2a9e0965f6bcb988d2e9031b752651bb5722
2018-03-09 23:45:47 +00:00
Treehugger Robot
0b9be36339 Merge "Fetch generated srcs from java libs for droiddoc." 2018-03-09 22:33:27 +00:00
Nan Zhang
1db85407aa Remove timestamp based filelist file for tracking Python dependencies
Each Python module will generate a zip file containing source & data
files. The Python binary will collect all its dependencies and use
merge_zips to merge each zip file to create a final .par file.

Test: m -j checkbuild && real examples:
Bug: b/70568913

Change-Id: I9ff232d461d33e1c06026e7dcb5b124bf02c3ce5
2018-03-09 14:12:48 -08:00
Dan Willemsen
6efd825af7 Merge "Revert "Fix absolute paths in clang debug output""
am: 19e62e5ebf

Change-Id: I878cde3b99fc07c4780810d574e9ed7df4446750
2018-03-09 21:12:03 +00:00
Treehugger Robot
19e62e5ebf Merge "Revert "Fix absolute paths in clang debug output"" 2018-03-09 20:59:33 +00:00
Pirama Arumuga Nainar
adfdd36948 Use a versioned profile file if available
am: 8aed42c798

Change-Id: I74fc63e09bcbb2fb03f7580bbe410af33ff7b2d7
2018-03-09 19:20:43 +00:00
Nan Zhang
b2b33de3c0 Fetch generated srcs from java libs for droiddoc.
api-stubs, system-api-stubs and etc need generated sources and srcjars from "framework",
so add a property that tell module to fetch srcs and srcjars from its
dependency libraries. The libraries in that property has to be in the
module's classpath.

Also add doc_defaults targets.

Bug: b/70351683
Test: m -j
Change-Id: I05831fbcad488037710950e4f05dc8fb2a12f403
2018-03-09 10:53:42 -08:00
Dan Willemsen
8fec83a8b9 Use xz prebuilt
Instead of whichever xz happens to be on the PATH.

Bug: 36130900
Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: Ic9b66062ca7947f0eca9d839c0864da492d4ef71
2018-03-09 10:53:26 -08:00
Pirama Arumuga Nainar
8aed42c798 Use a versioned profile file if available
Bug: http://b/74395273

Update profile-search logic to look for profile files named
<profile_file>.<arbitrary-version> in the profileProject and use that if
available.  This works around an issue where ccache serves stale cache
entries when the profile file has changed.

Test: touch toolchain/pgo-profiles/art/dex2oat.profdata.foo and check it
gets used.

Change-Id: I3de095c263b952cede25af7d0b63dc7280914d76
2018-03-09 16:05:54 +00:00
Nan Zhang
9428f61b31 Merge "Rename stubsjar to stubsSrcjar for droiddoc"
am: e9b02776f4

Change-Id: I7693fb2e8fa1076b905386f20d2264c90e9570d1
2018-03-09 10:04:30 +00:00
Treehugger Robot
e9b02776f4 Merge "Rename stubsjar to stubsSrcjar for droiddoc" 2018-03-09 09:42:29 +00:00
Logan Chien
870e5d96cd Merge changes I9bec563c,I34f06abd
am: 5a8d428dc7

Change-Id: Ifa6cd752e00eb31ec15a1bcc4094087529ee843b
2018-03-09 08:38:25 +00:00
Logan Chien
5a8d428dc7 Merge changes I9bec563c,I34f06abd
* changes:
  RemoveFromList() should remove all matches
  Add unit tests for android/util.go
2018-03-09 08:23:08 +00:00
Dan Willemsen
7aeb38867d Use our own TMPDIR
am: 32a669b01b

Change-Id: I11389f1291e47c2abb42340235a70458b55e4eba
2018-03-09 06:00:48 +00:00
Logan Chien
7922ab8da6 RemoveFromList() should remove all matches
RemoveFromList() should remove all matches.  Before this commit,
RemoveFromList() only removes the first match.  This commit rewrites
RemoveFromList() so that it will remove all matches.  Besides, a unit
test is written.

Note: aosp/461936 wants to make sure libc.so precedes libdl.so in
DT_NEEDED entries.  However, if there are two "libdl" in shared_libs,
aosp/461936 won't achieve its goal because RemoveFromList() (prior to
this commit) only removes the first "libdl".

Bug: 62815515
Test: Build sailfish and check libstagefright.so
Change-Id: I9bec563cbf800bff4bd508fb21e28869a92cfe56
2018-03-09 13:41:56 +08:00
Colin Cross
08c01e0906 Merge "Use turbine's native source jar support"
am: 0343d020b3

Change-Id: Ie8b1638f154f12e2216a70504e67b0fd0bb0751f
2018-03-09 03:45:52 +00:00
Dan Willemsen
32a669b01b Use our own TMPDIR
Some people have run into issues where /tmp is on a smaller partition
than their main source tree, and if it fills up (or only has a few GB
free), their builds can start failing.

There may also be a subset of people whose /tmp may be slower than their
out directory -- if they put their src and out trees on a SSD, but keep
/tmp on a spinning HDD.

Bug: 71755844
Test: check out/soong.log for TMPDIR
Test: do a build, watch out/soong/.temp
Change-Id: Ib749ec736ad0f6c8ce7453861a91b3e99ddbd92d
2018-03-08 19:42:00 -08:00
Treehugger Robot
0343d020b3 Merge "Use turbine's native source jar support" 2018-03-09 03:35:22 +00:00
Jayant Chowdhary
97c050375f Merge "Consider binder bitness while looking for abi references."
am: 7ebe5d10ad

Change-Id: If899d85c930e6476c3bad679feed96a5a99c69d9
2018-03-09 03:17:47 +00:00
Jayant Chowdhary
7ebe5d10ad Merge "Consider binder bitness while looking for abi references." 2018-03-09 03:11:01 +00:00
Dan Willemsen
ac2205f7fd Allow proto properties in cc/java_defaults
am: 6424d17a2d

Change-Id: Ib2a8944fcc173ca2a03c0cd768ec1e5816bd9391
2018-03-09 02:54:32 +00:00
Logan Chien
5e877b1a86 Add unit tests for android/util.go
Bug: 62815515
Test: lunch aosp_sailfish-userdebug && make   # runs soong unit tests
Change-Id: I34f06abdc78bfb28af3b5250491bbcddb7595c9b
2018-03-09 10:44:14 +08:00
Nan Zhang
ccff0f78ba Rename stubsjar to stubsSrcjar for droiddoc
Test: m -j core-docs
Bug: b/70351683
Change-Id: I65f310d68a5a940fe88ccce4a22110548c15c306
2018-03-08 17:29:32 -08:00
Dan Willemsen
8054f0a9d2 Revert "Fix absolute paths in clang debug output"
This reverts commit 253cab89ee. It is no
longer necessary.

Bug: 36463318
Bug: 72408185
Test: compare output directories after `m libc`
Test: compare treehugger output files
Change-Id: Ib5d7bbc13fa6f547e658247559153c61387e3604
2018-03-08 17:10:54 -08:00
Jayant Chowdhary
34ce67d454 Consider binder bitness while looking for abi references.
Binder bitness does not always correlate directly with primary arch, as
assumed earlier. For example: it is possible to have devices with
primary arch 'arm' and use 64 bit binder.

Bug: 74362434

Test: utils/create_reference_dumps.py;
      m -j vndk_package for aosp_arm64_ab, aosp_arm_ab invokes
      header-abi-diff on both arm and arm64 arches.

Test: mm -j64 in system/libhwbinder on troublesome internal target.

Change-Id: Iea0a24b57cdb3033e25b6fe126c5d5d717f45b4e
2018-03-08 16:49:59 -08:00
Dan Willemsen
6424d17a2d Allow proto properties in cc/java_defaults
Test: Add proto.canonical_path_from_root: true in a cc_defaults
Test: Add proto.canonical_path_from_root: true in a java_defaults
Change-Id: I9ddfc8af0025705a34b6e487225f1f98915054c3
2018-03-08 13:34:34 -08:00
Ivan Lozano
6f5690555e Merge "Add minimal-runtime support for integer overflows."
am: f7463f8dd2

Change-Id: I8f7b2fcf3140ee16e9c047a59ea0efe47a9d564f
2018-03-08 20:39:48 +00:00
Ivan Lozano
f7463f8dd2 Merge "Add minimal-runtime support for integer overflows." 2018-03-08 20:12:10 +00:00
Stephen Hines
eaf1bdb885 Switch back to clang-4639204.
am: 5e33119d5e

Change-Id: Ieb154b3944b7bab57461a14ee3a2f9e1e8470bd5
2018-03-08 17:29:35 +00:00
Stephen Hines
5e33119d5e Switch back to clang-4639204.
Bug: http://b/68397894
Test: build/run sailfish.
2018-03-08 01:28:34 -08:00
Stephen Hines
f2813cb6e7 Revert "Switch to clang-4639204."
am: a6d69b06f8

Change-Id: I5c42bae431cacdacb21dd8d6ed5e3f2b606cd5c4
2018-03-08 06:56:51 +00:00
Stephen Hines
a6d69b06f8 Revert "Switch to clang-4639204."
This reverts commit d4bc55624a.

Reason for revert: PGO + LTO is broken with the new toolchain.

Change-Id: I5b84d933746a8facd536167c2b040fb08302790b
2018-03-08 06:24:11 +00:00