Commit Graph

18402 Commits

Author SHA1 Message Date
android-build-team Robot
fe21655b52 Version bump to PQ1A.181105.011
Change-Id: I4764c0ffaf5aa342305810652e4522d2fa89581d
2018-09-20 19:06:12 +00:00
Treehugger Robot
5bc52ac49f Merge changes from topic "vndk28"
* changes:
  Condition VNDK check on TARGET_BUILD_APPS
  Revert "Revert "Add VNDK v28 to GSI from Android Q""
2018-09-20 06:21:43 +00:00
Dario Freni
ea0c204d4f Merge "Pass the intermediate dir to appcompat.sh"
am: abda944667

Change-Id: I5d7c51288fa4cd6739d29db7c2d9261527ce4070
2018-09-19 17:20:01 -07:00
Colin Cross
f31d9e78bb Merge "Don't set -pie for windows modules"
am: a70669e4a5

Change-Id: Ifced0ef70db93c0ac1cbf9a046c5badd41df9663
2018-09-19 17:19:28 -07:00
Yifan Hong
091115716b Merge "max size of dynamic partitions for AB devices are halved."
am: 185cce598b

Change-Id: Ie22e87c4a9a7d5a5f8dcea1c46e9225d0e950061
2018-09-19 17:05:37 -07:00
Treehugger Robot
abda944667 Merge "Pass the intermediate dir to appcompat.sh" 2018-09-20 00:00:54 +00:00
Colin Cross
a70669e4a5 Merge "Don't set -pie for windows modules" 2018-09-20 00:00:42 +00:00
Dario Freni
75266ab671 Pass the intermediate dir to appcompat.sh
For ASAN build the intermediate dir might differ from the default
directory.

Test: m (on an affected ASAN build)
Bug: 116020783
Change-Id: Ie4f282ea651d710351799f3fc24dba42e79ee63d
2018-09-19 23:18:38 +01:00
Colin Cross
feb4a7e4ae Don't set -pie for windows modules
Adding -pie to LOCAL_LDFLAGS for host linking leaves it around
when doing the host cross Windows linking, resulting in a warning:
clang-7: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]

Add it later in binary.mk after the flags have been copied to the
single-use my_ldflags.

Bug: 115776263
Test: m checkbuild
Change-Id: I70d71fa1ec6445631dc7e89ef61927a3304375e2
2018-09-19 15:18:17 -07:00
Yifan Hong
10f7310829 max size of dynamic partitions for AB devices are halved.
For example, if BOARD_SUPER_PARTITION_SIZE is
10GiB, then the sum of sizes of all dynamic partitions must
be within 5GiB.
Fixes: 115920069
Test: make

Change-Id: I800faff28e8483c92a1c0cf5e0b3bae4d638f86d
2018-09-19 14:33:14 -07:00
Dan Willemsen
a127ddfe6b Merge "Remove *_OUT_INTERMEDIATE_LIBRARIES"
am: c4af7d75dc

Change-Id: Ic661638b5379651cb9b8d566dd82b438358dc6e9
2018-09-19 10:37:33 -07:00
Dan Willemsen
c4af7d75dc Merge "Remove *_OUT_INTERMEDIATE_LIBRARIES" 2018-09-19 17:19:37 +00:00
Hung-ying Tyan
924d2d929d Condition VNDK check on TARGET_BUILD_APPS
Bug: 113560265
Test: (with the topic)
Test: mv prebuilts/vndk/v28 v28
Test: make TARGET_PRODUCT=aosp_arm TARGET_BUILD_APPS=Launcher3 TARGET_BUILD_VARIANT=userdebug
      --> build pass
Test: lunch aosp_arm-userdebug
      --> error: VNDK version 28 not found
Test: mv v28 prebuilts/vndk/v28
Test: lunch aosp_arm-userdebug
      --> no error
Change-Id: Ifb553a5ee4cec8b3f3b79aebdf824d64571fa817
2018-09-19 18:00:19 +08:00
Nan Zhang
bdebeee73f Copy api-versions.xml to out/target/common/obj/PACKAGING
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I77ecc43cd17baf7d7c414bb11e60045724865f43
Merged-In: I77ecc43cd17baf7d7c414bb11e60045724865f43
2018-09-18 23:35:07 -07:00
Nan Zhang
d332efd698 Merge commit 'ee16bfa6ca876affd27c07e28fdfb7c67dcd16fb' into stage-aosp-master
Test: m -j api-stubs-docs-jdiff
Change-Id: I927aadd930572365e823f4ae9636773a9820c9c8
2018-09-18 20:41:21 -07:00
Treehugger Robot
ee16bfa6ca Merge "Delete apidiff.mk" 2018-09-19 03:02:19 +00:00
TreeHugger Robot
6e0adb27ba Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING" into stage-aosp-master 2018-09-19 00:44:11 +00:00
David Anderson
a23e6a0b15 Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition."
am: f63b7f9c6f

Change-Id: I1195c47a1afb44a008afa1bf6953910609239b66
2018-09-18 17:43:04 -07:00
Treehugger Robot
f63b7f9c6f Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition." 2018-09-19 00:34:20 +00:00
David Anderson
8916a2a13c Don't pass --setup_as_rootfs_from_kernel when using a super partition.
When the system partition is a dynamic partition, the device will be
using an initial ramdisk and should not have a root device specified on
the kernel command-line.

Bug: 115939310
Test: device boots when BOARD_SUPER_PARTITION_PARTITION_LIST contains
      super and AVB is enabled.

Change-Id: I5c4b2304bf1ab6a59443c43c354845bf8a3949f0
2018-09-18 15:53:40 -07:00
Colin Cross
2f21154e9c Merge "Fix preopting Soong apps"
am: e20c6588ce

Change-Id: Iec08d1c84a3a232ffab2cac43ef800d4fd10df5a
2018-09-18 14:31:39 -07:00
Nan Zhang
972ecb8caf Copy api-versions.xml to out/target/common/obj/PACKAGING
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I77ecc43cd17baf7d7c414bb11e60045724865f43
2018-09-18 14:24:26 -07:00
Colin Cross
e20c6588ce Merge "Fix preopting Soong apps" 2018-09-18 21:10:40 +00:00
Tao Bao
a34d06f881 Merge "Add a missing closing quote in INSTALLED_RECOVERY_BUILD_PROP_TARGET."
am: d0a1f01dc7

Change-Id: I69ccd155b0e1e560c9e0f614836c598972adceca
2018-09-18 12:40:59 -07:00
Tao Bao
1edaca1af7 Add a missing closing quote in INSTALLED_RECOVERY_BUILD_PROP_TARGET.
Missing that doesn't seem to affect correctness, but it upsets the
syntax parsing in my editor.

Test: `m -j out/target/product/marlin/recovery/root/prop.default` with
      aosp_marlin-userdebug.
Change-Id: I272f6a6e4fe67b3ef316aa38896a0df0b42228d0
2018-09-18 10:26:49 -07:00
Colin Cross
1fe104cc13 Fix preopting Soong apps
dex_preopt_odex_install.mk should always be included, it handles
setting a default value for LOCAL_DEX_PREOPT.
Use dexpreopt-copy-jar when preopting to strip the dex file if
necessary.

Bug: 115967961
Test: m SystemUI
Change-Id: I74f77ed0e88a67043836407261f3845a16cbaf37
2018-09-18 10:16:37 -07:00
Dan Willemsen
962f88574b Merge "Fix installclean incremental builds w/veridex"
am: c55b42358d

Change-Id: I0fbce9da67d38082ef4507ce4a41210d838b5123
2018-09-18 02:32:38 -07:00
Treehugger Robot
c55b42358d Merge "Fix installclean incremental builds w/veridex" 2018-09-18 09:16:14 +00:00
Søren Gjesse
cfc4e3ec90 Merge "Don't include data resources when running R8"
am: 75e1c77f1b

Change-Id: If0bc2f4fe7d0436717f47e89f96bc75f6e395ef9
2018-09-17 23:33:54 -07:00
Søren Gjesse
75e1c77f1b Merge "Don't include data resources when running R8" 2018-09-18 06:22:21 +00:00
Colin Cross
aba1214550 Merge "Revert "Use soong_zip for otatools.zip, platform.zip, and otacerts.zip""
am: 89a9cb79e8

Change-Id: If1e879a545007b54f6bf5e7df9260891c288cc96
2018-09-17 20:09:14 -07:00
Colin Cross
0cbf03b8f9 Revert "Use soong_zip for otatools.zip, platform.zip, and otacerts.zip"
This reverts commit d55211f915.

Reason for revert: broke 64-bit only builds
Bug: 69500920

Change-Id: I5c3dfceb6f5b89eacd1b2279c87a1030a37f44db
2018-09-18 02:35:05 +00:00
Colin Cross
29d536b4f7 Merge "Use soong_zip for otatools.zip, platform.zip, and otacerts.zip"
am: 7edb09edc4

Change-Id: Idf9e7af4508988223fcaf4b0bd57a39bb6636046
2018-09-17 19:13:16 -07:00
Dan Willemsen
b73ccb7a25 Fix installclean incremental builds w/veridex
$(HOST_OUT)/obj/PACKAGING is cleaned via `installclean`, so regular
built modules should not be depending on it. Explicitly call out the
dependencies instead.

Test: m; m installclean; m
Change-Id: I0f318257e4742d6b7bd099dc06958ca8aba0cfb8
2018-09-17 16:01:14 -07:00
Nan Zhang
e06305123b Delete apidiff.mk
Also remove the msg.mk files used for old apicheck.

And export jdiff-doc.zip generated by Soong.

Test: api-stubs-docs-diff
Bug: b/78245848
Change-Id: I329aa375623a7b7a121d58314dab694a326c9f0f
2018-09-17 15:33:13 -07:00
android-build-team Robot
76435aa000 Version bump to PQ1A.181105.010
Change-Id: I6b7a3bc1faf60497ed0a56b3df480d9c40efe4cc
2018-09-17 22:15:45 +00:00
Colin Cross
fbdc2fe2d1 Merge changes from topic "make_umask"
am: d828c07b56

Change-Id: I68a9bb3d9b48d4433e0ef08587da49d922db21d5
2018-09-17 14:30:32 -07:00
Colin Cross
62f450722c Make package functions take an argument
am: 7b226865c1

Change-Id: Idafebfd86281b560e7bd014da66c936e58580efc
2018-09-17 14:29:41 -07:00
Colin Cross
d55211f915 Use soong_zip for otatools.zip, platform.zip, and otacerts.zip
soong_zip produces more reproducible zip files that are not
affected by umask values or timestamps.

Bug: 69500920
Test: m checkbuild
Test: contents of zips is unchanged
Change-Id: I2eca2f7618e06c0b5893ff54c79261921fe051d6
2018-09-17 12:04:27 -07:00
Dan Willemsen
8cf6b65445 Remove *_OUT_INTERMEDIATE_LIBRARIES
Always use the exact libraries like Soong does instead.

Test: m
Change-Id: Ifd48020073dd045247f76f84627c497e94562286
2018-09-15 10:52:13 -07:00
Colin Cross
c9e4976832 Replace some uses of zip with merge_zips, soong_zip, and zip2zip
zip maintains permissions when adding files to zips, which causes
the final jars and apks to change based on the umask of the build.
Move some of the rules that were using zip to soong_zip instead.

Since soong_zip doesn't support adding files to existing zips,
create a new zip file for each part of the package creation
process and then merge them together at the end with merge_zips.

Bug: 69500920
Test: m checkbuild
Change-Id: Id253df776ce19ec4cac3a36fa470a50461ea3cad
2018-09-15 09:16:26 -07:00
Roland Levillain
f16ce8df3c Merge "Revert "Make package functions take an argument""
am: d55eb7643d

Change-Id: I6939be3b2efe8ce3e658aea21c8a1471d096398b
2018-09-15 09:13:31 -07:00
Colin Cross
7b226865c1 Make package functions take an argument
In preparation for rearranging the way jars and apks are built.

Relands Ib9f0da132196942062c58fd5b12e84588106724e with a fix to
correctly include classes.dex in hostdex jars.

Test: m checkbuild
Change-Id: I397544456b8ce5827716fcd1828de707b719c2bb
2018-09-15 09:10:37 -07:00
Treehugger Robot
d55eb7643d Merge "Revert "Make package functions take an argument"" 2018-09-15 16:05:39 +00:00
Roland Levillain
70bd104353 Revert "Make package functions take an argument"
This reverts commit 5ea65dcc5e.

Reason for revert: Breaks some ART gtests on host.

Change-Id: I314692e31628a14d824e28544fdb3c765fc100f6
2018-09-15 12:46:44 +00:00
Colin Cross
99bd49a9fa Merge "Make package functions take an argument"
am: dcfdb91c07

Change-Id: If22f890b71e410e34799933b8848af9b639712c2
2018-09-14 20:25:13 -07:00
Colin Cross
dcfdb91c07 Merge "Make package functions take an argument" 2018-09-15 03:16:56 +00:00
Colin Cross
1fe6d8c6f5 Merge "Remove LOCAL_DONT_DELETE_JAR_DIRS"
am: 7f583f1e57

Change-Id: Ia1d3fd485490ec2fc9e1f720f49cd7a4babcb0b3
2018-09-14 19:29:09 -07:00
Treehugger Robot
7f583f1e57 Merge "Remove LOCAL_DONT_DELETE_JAR_DIRS" 2018-09-15 02:14:24 +00:00
Colin Cross
5ea65dcc5e Make package functions take an argument
In preparation for rearranging the way jars and apks are built.

Test: m checkbuild
Change-Id: Ib9f0da132196942062c58fd5b12e84588106724e
2018-09-14 16:55:18 -07:00