Commit Graph

17671 Commits

Author SHA1 Message Date
Colin Cross
0ab356ac20 Merge "Use zip2zip for uncompress-dexs and uncompress-shared-libs" 2018-10-09 00:29:14 +00:00
Colin Cross
808af69564 Merge "Don't zip hiddenapi output jar into jar"
am: f05a023a5a

Change-Id: I11a335aaa98477fd3da9b1608d5ac83b45dafa87
2018-10-08 15:10:06 -07:00
Dan Willemsen
a7557afd71 Merge "Update for flags passed from Soong"
am: 159693a3e5

Change-Id: I5546acc1b6b88488a4bd088d106feea852c8026d
2018-10-08 15:05:55 -07:00
Colin Cross
f05a023a5a Merge "Don't zip hiddenapi output jar into jar" 2018-10-08 22:04:59 +00:00
Colin Cross
dac94fff8f Use zip2zip for uncompress-dexs and uncompress-shared-libs
Unzipping and rezipping files causes the umask of the host machine
to affect the permissions in the APK.  Use the new zip2zip -0 feature
to rewrite the zip file with selected files uncompressed.

Bug: 69500920
Test: m checkbuild
Change-Id: I82dd3aa441712772a1d1ddd6aaf5f41179facaa7
2018-10-08 12:49:11 -07:00
Colin Cross
c3c62fba96 Don't zip hiddenapi output jar into jar
Zip classes*.dex so that the jar does not contain an empty
classes.jar.

Test: m out/target/common/obj/JAVA_LIBRARIES/android.test.base.impl_intermediates/javalib.jar
Change-Id: I53bdd2035b2963dd781734da64058c95e1cff9d4
2018-10-08 11:23:59 -07:00
Dan Willemsen
7a5c5d730f Update for flags passed from Soong
Obsolete more GCC-specific flags, TARGET_(arm|thumb)_CFLAGS now contains
pre-filtered clang flags, and GLOBAL_CLANG_CFLAGS_NO_OVERRIDE now
contains all flags instead of just the clang additional flags.

Test: m
Change-Id: I068f155041e681068d38e1a5b6b04d354b85ccee
2018-10-07 19:43:23 -07:00
patricktu
3773dc822d Merge "aidegen: Collect all java sources from makefile system."
am: c18b2b28c2

Change-Id: I23f6091ee0df91f274394ecb34ecb002451514d1
2018-10-05 19:24:26 -07:00
patricktu
b23d8e6502 aidegen: Collect all java sources from makefile system.
Bug: 117129969
Test: make -j64 out/target/product/generic_x86_64/module-info.json
Change-Id: I4bc6cab8e56a1ed6485ad2f5f22fe9b8149b25d0
2018-10-05 14:55:36 +08:00
Yifan Hong
ecb1717422 Merge "Support "updatable groups"."
am: 3f0d1ad451

Change-Id: I704c56ff836e88f3a6c45a6869c9c111591860bc
2018-10-04 15:44:16 -07:00
Yifan Hong
3f0d1ad451 Merge "Support "updatable groups"." 2018-10-04 22:21:57 +00:00
Yifan Hong
b43012f0ad Support "updatable groups".
* BOARD_SUPER_PARTITION_GROUPS defines a list of "updatable groups". Each
updatable group is a group of partitions that share the same pool of free
spaces.

* For each group in BOARD_SUPER_PARTITION_GROUPS, a BOARD_{GROUP}_SIZE and
BOARD_{GROUP}_PARTITION_PARTITION_LIST may be defined.
    - BOARD_{GROUP}_SIZE: The maximum sum of sizes of all
      partitions in the group.
      If empty, no limit is enforced on the sum of sizes for this group.
    - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that
      belongs to this group.
      If empty, no partitions belong to this group, and the sum of sizes is
      effectively 0.

* BOARD_SUPER_PARTITION_PARTITION_LIST should not be defined
by the device. It is now computed from all
BOARD_{GROUP}_PARTITION_PARTITION_LIST.

* Each 'updatable group' has its own pool of space for its
partitions to grow into. Enforce the following:
    * sum(all partitions) <= super partition (/ 2 for A/B)
    * For each group, sum(partitions in group) <= group size
    * sum(all group sizes) <= super partition (/ 2 for A/B)

Test: builds
Bug: 111610495
Change-Id: I072b011714ec31a1d8813cc75edd27da3c6ff39a
Merged-In: I072b011714ec31a1d8813cc75edd27da3c6ff39a
2018-10-04 13:08:56 -07:00
David Anderson
df6037fbf7 Merge "Remove uuidgen.py and update lpmake parameters."
am: d1428e2748

Change-Id: I3845a3818612d777e4a9ae95c2efddcb88233efd
2018-10-04 11:56:44 -07:00
Colin Cross
0fa751ba68 Add support for JNI libraries to soong_app_prebuilt.mk
Use install_jni_libs_internal.mk to install JNI libraries alongside
preinstalled APKs.  APKs with embedded JNI libraries are handled
within Soong.

Bug: 80095087
Test: m checkbuild
Change-Id: I2ecf10b6771dff14c940cc6e6442eb2ae43a75b0
2018-10-04 11:24:15 -07:00
David Anderson
d1428e2748 Merge "Remove uuidgen.py and update lpmake parameters." 2018-10-04 18:20:47 +00:00
Anton Hansson
21e7c05f7e Merge "Move a few more string functions to strings.mk"
am: d6e5cb1add

Change-Id: I20cf6bbef1c3aa05ea034ddd52e16fe2a9e87b1a
2018-10-04 07:03:28 -07:00
Anton Hansson
d6e5cb1add Merge "Move a few more string functions to strings.mk" 2018-10-04 13:47:55 +00:00
David Anderson
b954afec0b Remove uuidgen.py and update lpmake parameters.
Bug: 117229984
Test: device builds with PRODUCT_USE_LOGICAL_PARTITIONS=true
Change-Id: Ib39d19726861dd79d90923163f9e594ed91da4ca
2018-10-03 14:24:34 -07:00
Anton Hansson
9920578c25 Merge "Fix TWS requirement in definitions.mk"
am: ee08d635c7

Change-Id: I45983ac80720fa969f953b3a7ddd312f252eb85a
2018-10-03 08:56:54 -07:00
Anton Hansson
ee08d635c7 Merge "Fix TWS requirement in definitions.mk" 2018-10-03 15:41:22 +00:00
Anton Hansson
4967b34ddd Move a few more string functions to strings.mk
So they can be used in product.mk

Bug: 80410283
Test: make
Change-Id: Ic94754f6b48a3281ca1dd8c195a3410b543eb366
2018-10-03 15:59:39 +01:00
Anton Hansson
a0f91bd506 Fix TWS requirement in definitions.mk
Removing this TWS breaks the build. Add a backslash to avoid
needing it.

Test: make
Change-Id: I4f8e127218ffbf55a3e11600569f0100e914d2e2
2018-10-03 13:38:00 +01:00
Anton Hansson
7cf752a9dd Merge "Tidy up TARGET_COPY_OUT_X variable defs"
am: dd34185ae1

Change-Id: Ib15c863191e5a178d5b216b05f8aebfe21c30225
2018-10-03 02:09:44 -07:00
Anton Hansson
dd34185ae1 Merge "Tidy up TARGET_COPY_OUT_X variable defs" 2018-10-03 08:56:46 +00:00
Colin Cross
39b2705b4b Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong"
am: 9c68021f67

Change-Id: Ibfeec922cee943935097be7b208c890fbc1dc09a
2018-10-02 20:16:12 -07:00
Treehugger Robot
9c68021f67 Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong" 2018-10-03 03:05:08 +00:00
Vladimir Marko
a3af0a2bea Merge "Build: Remove boot*.art.rel file generation."
am: 0e01669293

Change-Id: Ic54949d05a04bbd6f0c3a57dcbcc1c8cf09af99e
2018-10-02 09:58:58 -07:00
Anton Hansson
379b2ba485 Tidy up TARGET_COPY_OUT_X variable defs
- Don't duplicate the same comment over and over
- Stop defining values that are immediately overwritten

Test: make
Change-Id: I87cb2c2b76bb69a026695e145849f4acee197b94
2018-10-02 14:12:50 +01:00
Anton Hansson
ae9f10544d Change install paths of libs in sanitize builds
This changes the paths for partitions modules inside the 'asan'
subdirectory to match those used when not making sanitized builds.

This fixes get_non_asan_path macro, which just strips the 'asan' dir
from the lib paths.

For example, on a device without a product partition, previously
libraries would install install in:
- out/target/product/x/asan/product/lib[64]/y.so (with SANITIZE_TARGET)
- out/target/product/x/system/product/lib[64]/y.so (no SANITIZE TARGET)

Stripping the asan dir would look for the lib in out/.../<x>/product/,
which didn't exist. The new path for SANITIZE_TARGET builds is now
out/target/product<x>/asan/system/product/lib[64]/<y>.so

Bug: 117089649
Test: m; SANITIZE_TARGET=address m (for a device without /product)
Change-Id: Id663c5f284e3b4fc65ed8cb8c2da6bcf6542e034
2018-10-02 13:16:05 +01:00
Vladimir Marko
e47795ba3d Build: Remove boot*.art.rel file generation.
These files are now unused, patchoat shall be removed soon.

Test: m
Test: Pixel 2 XL boots.
Bug: 77856493
Change-Id: I07babe7e6b2657e340265e74042e958a91678329
2018-10-02 08:54:11 +01:00
Anton Hansson
240c1c0606 Merge "Record installed JNI libs in INSTALLED files."
am: ec382da316

Change-Id: Ia5f506ecfa40d97d869af1a16233ba608c99c949
2018-10-02 00:51:38 -07:00
Anton Hansson
ec382da316 Merge "Record installed JNI libs in INSTALLED files." 2018-10-02 07:35:31 +00:00
Colin Cross
4aa10a3cc5 Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94
am: 7307de5e0c

Change-Id: Ifa95c4ec335d9bf913f851101f09c55840091dce
2018-10-01 19:15:18 -07:00
Colin Cross
7307de5e0c Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94
* changes:
  Disable sdk_addon for mmm
  Use soong_zip for platform.zip
  Use soong_zip for otatools.zip and otacerts.zip
2018-10-02 01:55:47 +00:00
Colin Cross
d0f3a3b01a Pass TARGET_PREFER_32_BIT_APPS to Soong
Bug: 80095087
Test: m checkbuild
Change-Id: I1ca8bebb360dd1e8102bb5840709f79cc22be03c
2018-10-01 15:31:54 -07:00
Colin Cross
8c200e1865 Merge "Fix boot_profile_jars.zip"
am: e70d749190

Change-Id: Idd1e917dbd85fbfe5aea8d0d2b9598a0f7a7a50c
2018-10-01 14:14:47 -07:00
Treehugger Robot
e70d749190 Merge "Fix boot_profile_jars.zip" 2018-10-01 20:53:22 +00:00
Colin Cross
731b73fdf9 Merge "Fix PDK builds"
am: aa1645504f

Change-Id: Ia910bb42dcb225cc8e0d648bd0d890552251183f
2018-10-01 13:48:30 -07:00
Colin Cross
8b6c94c744 Disable sdk_addon for mmm
mmm has a smaller view of the world and cannot generate sdk-addon
zip files.

Bug: 116818719
Test: m checkbuild
Change-Id: I9e73c0b84a42aaaa353704d6ab245b449166606d
2018-10-01 13:41:27 -07:00
Colin Cross
7363cde33e Use soong_zip for platform.zip
soong_zip produces more reproducible zip files that are not
affected by umask values or timestamps.

This partially reapplies I2eca2f7618e06c0b5893ff54c79261921fe051d6
with fixes for 64-bit only builds and directories that are changing
during zipping.

Bug: 69500920
Test: m checkbuild
Test: m checkbuild platform
Test: lunch hikey64_only && m platform
Test: contents of zips is unchanged
Change-Id: Iac5c43276f7ae700d4d13d0ef27003d09c1c87e0
2018-10-01 13:41:27 -07:00
Colin Cross
21122f901c Use soong_zip for otatools.zip and otacerts.zip
soong_zip produces more reproducible zip files that are not
affected by umask values or timestamps.

This partially reapplies I2eca2f7618e06c0b5893ff54c79261921fe051d6.

Bug: 69500920
Test: m checkbuild
Test: contents of zips is unchanged
Change-Id: Idf6fbc94e257dc34af4f5b115d740b7cb9bac015
2018-10-01 13:41:27 -07:00
Colin Cross
aa1645504f Merge "Fix PDK builds" 2018-10-01 20:30:30 +00:00
Colin Cross
1a81e372b5 Fix boot_profile_jars.zip
soong_zip was previously ignoring trailing command line arguments,
but now they are an error.  boot_profile_jars.zip had all its
files as trailing arguments instead of as -f flags, previously
resulting in an empty zip, but now causing an error.  Fix the
arguments to use -f before each file.

Test: m PRODUCT_DIST_BOOT_AND_SYSTEM_JARS=true out/target/product/sailfish/boot_profile_jars.zip
Change-Id: I8ac4aa4fbca812b8aa2ff9526e1ed7c769dd8420
2018-10-01 17:45:59 +00:00
Anton Hansson
74871e1ba3 Merge "Create a dump-files phony target."
am: b7b43c2cd5

Change-Id: I48267a69f78550e63436f5eb0830750e523ab6f4
2018-10-01 10:36:16 -07:00
Anton Hansson
6961e53876 Create a dump-files phony target.
This is more convenient than the current always-off conditional,
because it doesn't require changing the build system to dump
the installed files.

Bug: 80410283
Test: m dump-files
Change-Id: I7d395750673aff07d2018ffce8321dd280b94ccf
2018-10-01 16:26:17 +01:00
Anton Hansson
8b7ecc06c7 Record installed JNI libs in INSTALLED files.
The installed jni libs were previously not tracked in the way
other installed files were. One problem with this is that the
product-installed-files macro failed to track these files.

Bug: 80410283
Test: build_test
Change-Id: I85f528f228ef6921ed596d58303991a5370ae631
2018-10-01 16:23:53 +01:00
Colin Cross
53c8f9789a Fix PDK builds
$OUT/obj/APPS/SystemUI_intermediates/package.dex.apk was not being
written after being converted to Soong.  Add a copy rule for it
to soong_app_prebuilt.mk, add it as an implicit output to the Make
rules that create it, and add it as a real dependency to the
platform.zip rules.

Test: m platform
Change-Id: I96f58d3d80b764a51a6acb87e92498589cfe5c18
2018-09-29 22:33:41 -07:00
Dan Willemsen
5256407e12 Merge "Remove obsolete make settings"
am: 757345ecb6

Change-Id: I0cfadebe814cb80e28bcdf3e8fe4a0338454ad66
2018-09-28 21:19:47 -07:00
Dan Willemsen
95e91f8e39 Remove obsolete make settings
We turn off the default implicit and suffix rules with
--no_builtin_rules.

DELETE_ON_ERROR has no effect, ninja just keeps track of whether we've
successfully built it or not.

Test: build-aosp_arm.ninja is the same before/after
Change-Id: I2e407d4a12dd3a2af3e923fe3e1a3f7a6e2a463c
2018-09-28 10:27:48 -07:00
Colin Cross
5fa79d2afd Merge "Pass classpath to d8"
am: 1ac080e9e5

Change-Id: Ie46d1d978d1ab132ee98f637f91fcf61d745c474
2018-09-27 16:37:48 -07:00