Commit Graph

17671 Commits

Author SHA1 Message Date
Treehugger Robot
1ac080e9e5 Merge "Pass classpath to d8" 2018-09-27 23:27:45 +00:00
Tom Cherry
e490e330a0 Merge "Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE"
am: b6eeba5bab

Change-Id: Ie75a57cad2f8024b61173da5d5aef0ca726ff9be
2018-09-26 15:35:05 -07:00
Tom Cherry
b6eeba5bab Merge "Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2018-09-26 22:24:54 +00:00
Simran Basi
33724676b9 Merge "Create an artifact to output module-info and OWNERS files in source code"
am: 004b9b7b7d

Change-Id: I3536b4c6268659117237fd3b3001c8a208e841f9
2018-09-26 14:48:44 -07:00
Treehugger Robot
004b9b7b7d Merge "Create an artifact to output module-info and OWNERS files in source code" 2018-09-26 21:37:54 +00:00
Tom Cherry
2929cadb3b Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE
The recovery image already contains a copy of first stage init, so we
can boot unconditionally to the recovery image and instruct first
stage init whether or not to boot to Android or to recovery.  In this
case, we need neither the kernel to mount /system as / nor a separate
partition for recovery, so this change modifies the build scripts to
allow this combination.

Bug: 114062208
Test: Boot pixel from recovery to Android with BOARD_USES_RECOVERY_AS_BOOT
      But without BOARD_BUILD_SYSTEM_ROOT_IMAGE
Change-Id: Icd047afb7f22d2724b3bcaca1aa0c837426dcce7
2018-09-26 20:30:36 +00:00
Matt Wachowski
7318443ea1 Merge "Added rules to include verified boot config in zip"
am: 7e67802381

Change-Id: Ibbf4b6bc2f37621ab255123e417b8ea04dd61694
2018-09-26 10:28:21 -07:00
Matt Wachowski
7e67802381 Merge "Added rules to include verified boot config in zip" 2018-09-26 17:15:11 +00:00
Pirama Arumuga Nainar
80ba345f0e Change STL for Windows to libc++.
- Link libgcc_eh, which needs pthread, which in turn depends on
kernel32.  Wrap the libraries with --start-group and --end-group and
remove duplicates.
- Use SjLj exceptions for 32-bit.  libgcc_eh implements SjLj exception
model for 32-bit.
- Disable visibility annotations for libcxx and libcxxabi since we are
only going to support these as static libraries.
- Use Win32 threads.  MinGW pthreads throws an error when building
libcxx since it's pthread_mutex_initializer is not constant (needs a
cast).

Test: Build and test Windows binaries under Wine.

Change-Id: I594fa7673282ff5c1b7b80d49f48b7618960a148
2018-09-25 21:11:23 -07:00
Tao Bao
7f7d6e3139 Merge "Remove INCLUDE_TEST_OTA_KEYS."
am: 15a7ea1313

Change-Id: I37a43b7f8ed4c86d6a1b54f088626319d659aa6d
2018-09-25 16:43:42 -07:00
Tao Bao
2790154041 Remove INCLUDE_TEST_OTA_KEYS.
This has been long dead since commit
17c83cf22c (2009).

Test: m checkbuild (via TreeHugger)
Test: No hit in code search.
Change-Id: I054241ae63436ade2f4e50ec2fc3757ae35635dd
2018-09-25 12:43:34 -07:00
Yifan Hong
b9f8a6fa45 Merge "to-upper and to-lower move to strings.mk"
am: 1f5c41bacf

Change-Id: I560609312c0c64b1412249846e1134e581a4a4a8
2018-09-25 10:51:20 -07:00
Simran Basi
03f5253020 Create an artifact to output module-info and OWNERS files in source code
Bug: 114242886
Test: make dist -j owners
      make dist -j module-info

Change-Id: I6d00928c25e3213a5563e64806e0c04530161581
2018-09-24 16:31:29 -07:00
Yifan Hong
c49bddfb67 to-upper and to-lower move to strings.mk
So that config.mk can use these functions.
Test: builds

Change-Id: I6634226cbed56c34977803ff9c75b8d481c21c34
2018-09-24 14:45:41 -07:00
Chih-Hung Hsieh
4666c24a1e Merge "Strip spaces in my_tidy_flags."
am: f4328b08f6

Change-Id: I5a421511a035f00c006230d1ec26a6f6d482ef75
2018-09-21 14:19:25 -07:00
Colin Cross
ec17af3364 Pass classpath to d8
d8 requires the full classpath if --min-api requires default method
or try-with-resources desugaring.  Always pass the full classpath,
since it will already have been built to generate the input jar.

Bug: 116243313
Test: m checkbuild
Change-Id: I363b4d3145e23d4eed77455c1897430206f3ac22
2018-09-21 12:36:53 -07:00
Chih-Hung Hsieh
1d9f04ff53 Strip spaces in my_tidy_flags.
Test: make with WITH_TIDY=1 DEFAULT_TIDY_HEADER_DIRS="d1/d2|external/*"
Bug: 32668284
Change-Id: I7443210444d65d7e31b91b312bc518e40167305d
2018-09-21 10:30:31 -07:00
Hung-ying Tyan
48d9f62e6c Merge changes from topic "vndk28"
am: 5bc52ac49f

Change-Id: I4b1acde427a78f9c49a6d9e5bb2ad6af245de9da
2018-09-20 22:36:57 -07: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