Commit Graph

6904 Commits

Author SHA1 Message Date
Colin Cross
01801b3f50 Merge "Replace extract-srcjars.sh with zipsync tool" am: 21f8080d86
am: c48f545d17

Change-Id: Ia3f9cfd8f5d2e9ec11e64c8ef3cd63d1d5742ff2
2018-03-19 21:01:57 +00:00
Colin Cross
c48f545d17 Merge "Replace extract-srcjars.sh with zipsync tool"
am: 21f8080d86

Change-Id: I0c83f9ae4c22915a74ce81c6e5606841240c8242
2018-03-19 20:54:56 +00:00
Colin Cross
21f8080d86 Merge "Replace extract-srcjars.sh with zipsync tool" 2018-03-19 20:33:08 +00:00
Logan Chien
2ced34b14e Merge changes I406c5bef,Ibde685d7,I1c09412d am: 45d4f09f2f
am: 6eaae1a84a

Change-Id: I1cf47a14f8245d01a783d98cff0c2fec46e1193b
2018-03-16 02:19:45 +00:00
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
436b76564d Replace extract-srcjars.sh with zipsync tool
extract_srcjars.sh uses zipinfo and unzip, which fail with an
error on an empty zip file.  Instead of trying to hack around
this (which is hard to make guarantees for since they are
non-hermetic host tools), replace them with a go tool to unzip
a set of zip files into a directory.

Bug: 73885582
Test: m checkbuild
Change-Id: I151fed347ed5196726e36866ffc27bc831799afb
2018-03-15 16:42:43 -07:00
Colin Cross
b9950182ff Merge "Update turbine command line flags" am: 1eb9f090e0
am: a717c1e346

Change-Id: I3add7c66a694c7e5407c6360e4ff89227c1932bc
2018-03-15 23:09:16 +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
Jayant Chowdhary
8c34564d41 Consider binder bitness while looking for abi references.
am: 070f605485  -s ours

Change-Id: I4c2bcc9fdf24b278faa0e4f13eb58fffac780980
2018-03-14 20:58:11 +00: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
15b159179d Add DistPath to reference the dist folder am: bc0c509267
am: bb8f0eed0f

Change-Id: Ic15f59a508065bbc2ef139413cdc76f49886fd3a
2018-03-14 00:33:38 +00:00
Dan Willemsen
74edf2fdbe Switch PackageContext functions to take a ctx am: 54daaf0371
am: f34acc112e

Change-Id: I11d13250bbe1b40179b764799ca607b2bacc607b
2018-03-14 00:33:31 +00: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
Jayant Chowdhary
070f605485 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.

Merged-In: Iea0a24b57cdb3033e25b6fe126c5d5d717f45b4e
Change-Id: Iea0a24b57cdb3033e25b6fe126c5d5d717f45b4e
(cherry picked from commit 34ce67d454)
2018-03-12 16:56:03 -07: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
04f97ce059 Remove obsolete Brillo variable am: a052599bb6
am: 567eda6a7d

Change-Id: I69edc621c71a4a5dc80595392b8914e1cca07e52
2018-03-12 22:04:12 +00: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
961d48233d Merge "Use xz prebuilt" am: 9c6bc37da1
am: f1f4fca756

Change-Id: Ifb1f626935e89dae2fe65b4fec67a24de70d49d1
2018-03-10 03:12:13 +00:00
Pirama Arumuga Nainar
11740678d0 Use a versioned profile file if available
am: fb7f985c84  -s ours

Change-Id: Id6546a1f99e411533f6b44cd7f26184ff9308b7d
2018-03-10 03:07:54 +00: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
5e214371d0 Merge "Remove timestamp based filelist file for tracking Python dependencies" am: 8b00247b66
am: 7cc98e9af5

Change-Id: Ifeb1865889ce053536f445c3352bd7177a64b69f
2018-03-10 00:57:37 +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
d6cc6b789e Merge "Fetch generated srcs from java libs for droiddoc." am: 0b9be36339
am: cc2631e883

Change-Id: Ib53b56a5204d0f0a6d86f5b298456ca702c5d621
2018-03-10 00:38:17 +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
Pirama Arumuga Nainar
fb7f985c84 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
Merged-In: I3de095c263b952cede25af7d0b63dc7280914d76
(cherry picked from commit 8aed42c798)
2018-03-09 13:18:28 -08:00
Dan Willemsen
0944244d42 Merge "Revert "Fix absolute paths in clang debug output"" am: 19e62e5ebf
am: 6efd825af7

Change-Id: I3c7bd0f5f22289b926ea4d1c841c4f1c79e71cd0
2018-03-09 21:16:04 +00: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
cfd6a03c94 Use a versioned profile file if available am: 8aed42c798
am: adfdd36948

Change-Id: I588426b1d59f4b7a40feb745ffbd7be1c3b20476
2018-03-09 19:26:20 +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
Stephen Hines
acbba95156 Switch back to clang-4639204.
am: c5a4f3be45

Change-Id: I708094005a6ee162a367b1fc1fe5273eebfa6f8a
2018-03-09 18:08:09 +00: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
d6db354033 Merge "Rename stubsjar to stubsSrcjar for droiddoc" am: e9b02776f4
am: 9428f61b31

Change-Id: I522973613a2f6a06ef5fc402a90313a8085f5b38
2018-03-09 10:15:20 +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
cb3b31063a Merge changes I9bec563c,I34f06abd am: 5a8d428dc7
am: 870e5d96cd

Change-Id: Idb504b33df063322ff8dc162df40953d86f5c7fd
2018-03-09 08:42:41 +00:00