Commit Graph

17716 Commits

Author SHA1 Message Date
Tao Bao
b1a2e353f2 Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET.
This also fixes the emulator build issue with `BOARFD_AVB_ENABLE := true`.

Bug: 78113934
Test: `m dist` with emulator builds.
Test: `m dist` with aosp_taimen-userdebug
Change-Id: I2089e0ab15885b4cfc16d4a7e8be3dd0b60ef46f
2018-08-14 16:17:12 -07:00
Colin Cross
232bc25b8a Merge "Remove TARGET_USES_MKE2FS"
am: de684e84fb

Change-Id: If2f3d4fba3e782d12962b2d99b3d6b709ff85b70
2018-08-14 15:51:33 -07:00
Colin Cross
e3a4df80c8 Allow Soong to autogenerate test configs
Move the configuration for autogenerating test configs into Soong,
and add LOCAL_FULL_TEST_CONFIG so that Soong can specify the full
path to a generated test config.

Also add a java junit test config template.

Bug: 70770641
Test: m checkbuild
Test: atest CtsUiRenderingTestCases
Test: atest junit-params-test
Change-Id: I2e64bc33c949ab7b342be518f94a81a186fe9c07
2018-08-14 15:39:32 -07:00
Colin Cross
579668b122 Track more static dependencies for notice files
Track transitive static dependencies of native binaries, and
and direct and transitive static dependencies of java and app
modules.

Bug: 112331930
Test: m checkbuild
Change-Id: I0e19971033d6254bfbb6555f0e68fd5e529569c6
2018-08-14 15:39:32 -07:00
yangbill
976c80ae86 ATest: Host native test config auto-gen support.
Autogenerate HostGTest test config for better user
experience of hostside native tests.

BUG: 80298359

Test: . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j
      . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j hello_world_test
      . build/envsetup.sh ; lunch aosp_x86_64-eng ; make -j CtsLiblogTestCases_list

Change-Id: Iee1db17f8957d3c1cd80c9aae1996a72b48413d9
2018-08-14 14:53:14 -07:00
Colin Cross
de684e84fb Merge "Remove TARGET_USES_MKE2FS" 2018-08-14 20:55:51 +00:00
Tao Bao
62a5dc05af Merge "Revert "Generate the list of installed files in recovery image.""
am: 8254fc122d

Change-Id: Id23481272afcea0966f18adbf7aa0010208e4a79
2018-08-14 11:57:56 -07:00
Tao Bao
60a47827cb Revert "Generate the list of installed files in recovery image."
This reverts commit 774f63db4a.

Bug: 112590987
Test: N/A
Change-Id: I7b1c642149d45071ae4c8c9a2cedc40b4e360397
2018-08-14 11:30:58 -07:00
Alex Light
2b73395973 Merge "Revert "Build image for clean super partition.""
am: 1efb8a7a83

Change-Id: Id617ce1315d085e8ac0d008a3173b36a3a115cf0
2018-08-14 09:49:29 -07:00
Alex Light
1efb8a7a83 Merge "Revert "Build image for clean super partition."" 2018-08-14 16:34:26 +00:00
Alex Light
989b3ad859 Revert "Build image for clean super partition."
This reverts commit 8a72da6c63.

Reason for revert: breaks a build

Change-Id: I743a67757c560b5bb2b201612d0898276b6804b6
Test: None.
2018-08-14 16:25:52 +00:00
Mathew Inwood
12966aff07 Merge "Pass public API list to class2greylist tool."
am: c296e5eeb9

Change-Id: I9c14f682f4bf55a7c2cc6902edbfeb0a3bfc83a1
2018-08-14 00:38:17 -07:00
Mathew Inwood
c296e5eeb9 Merge "Pass public API list to class2greylist tool." 2018-08-14 07:22:44 +00:00
David Anderson
70c448f6de Merge "Build image for clean super partition."
am: 6f08de7963

Change-Id: I2c100e450786d326de94dadf7419fbc15fb820ea
2018-08-13 19:59:32 -07:00
Morris Lin
861ac1b65e Merge "module-info.mk: Output actual module_name."
am: 76f68c6b0e

Change-Id: I36ce757373ddd93bfa092d3957aca93fe1fe7cd8
2018-08-13 19:58:59 -07:00
Treehugger Robot
6f08de7963 Merge "Build image for clean super partition." 2018-08-14 02:54:02 +00:00
Treehugger Robot
76f68c6b0e Merge "module-info.mk: Output actual module_name." 2018-08-14 02:48:26 +00:00
Bowgo Tsai
f0f87a9624 Merge "Adding constraints for first shipping API level >= 29"
am: e52846ae7f

Change-Id: I71b02795eee1d38be3e3bfd683104cdc8b886c0f
2018-08-13 19:30:56 -07:00
Treehugger Robot
e52846ae7f Merge "Adding constraints for first shipping API level >= 29" 2018-08-14 02:17:24 +00:00
Xin Li
23bc1e615d Merge "Merge stage-dr1-aosp-master into stage-aosp-master" into stage-aosp-master 2018-08-13 23:42:34 +00:00
Tao Bao
cf8853b599 Suppress the warning when copying init.recovery.*.rc.
The file is optional, and we already ignore the cp result.

cp: cannot stat 'out/target/product/taimen/root/init.recovery.*.rc': No such file or directory

Test: `m -j bootimage` with aosp_taimen-userdebug. No more warning.
Change-Id: I815c6e0ff8d432123066cf4a44a8638dc94c96d5
2018-08-13 14:30:04 -07:00
David Anderson
8a72da6c63 Build image for clean super partition.
This adds a new super_empty.img output to the build when
PRODUCT_USE_LOGICAL_PARTITIONS is true and a super partition size is
set. This will be used by fastboot flashall in fastbootd, since it needs
a record of the partition layout in case the super partition is corrupt
or not yet flashed.

The full super.img (which contains embedded partition data) is still
available via "make dist".

Bug: 78793464
Test: super_empty.img generated when PRODUCT_USE_LOGICAL_PARTITIONS is
      true

Change-Id: I9f00b07e5b685a3230803fa1a5a569544d0ab625
2018-08-13 13:13:08 -07:00
Xin Li
33f1756668 Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: Ia25f596baca4ad2d3ac57b380c0a64477833c8aa
2018-08-13 13:00:58 -07:00
Tao Bao
9614010210 Merge "Generate the list of installed files in recovery image." 2018-08-13 18:08:20 +00:00
Colin Cross
a110579e31 Remove TARGET_USES_MKE2FS
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
2018-08-13 17:40:26 +00:00
Tao Bao
774f63db4a Generate the list of installed files in recovery image.
We're putting more files into recovery image since adding the support
for using shared libraries in recovery. This CL generates the list of
files to help understand the exact files installed there and their
sizes.

Bug: 112494634
Test: `m dist` with aosp_marlin-userdebug. Check the generated file at
      out/dist/installed-files-recovery.{txt,json}.
Change-Id: I7a9e05da52f95059a7d7adc85c74e888125ee66e
2018-08-13 09:19:17 -07:00
Bowgo Tsai
e4e3018bf6 Adding constraints for first shipping API level >= 29
Do not allow setting BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE when
first shipping API level >= 29.

Bug: 112291283
Test: Checks it can cause build error when the condition is met

Change-Id: I3983bea89625f5ece303432b32bea277aee21a2b
2018-08-14 00:17:50 +08:00
Mathew Inwood
c4d57494b5 Pass public API list to class2greylist tool.
This is necessary to allow it to exclude synthetic bridge methods from the
generated greylist. We need to be able to apply the @UnsupportedAppUsage
annotation to regular (non-bridged) methods, but due to the SDK visibility
rules, the synthetic bridge is part of the SDK.

Don't do this on build that don't include frameworks/base since the
target is not needed and breaks certain builds.

Bug: 110868826
Test: m
Change-Id: I08f06f38d84945f5473618513c641762bc541e24
2018-08-13 16:21:21 +01:00
Jason Monk
ff5a2b5694 Merge "Adding overrides support to android_app bps" am: 7e06b26b5e
am: 356a3d4889

Change-Id: I546fb03c659d1c0e2f675685f96704264f91c4dd
2018-08-10 12:32:24 -07:00
Roland Levillain
431ea03e96 Merge "Revert "Pass public API list to class2greylist tool."" am: 3f3505ca5f
am: 67ee73c51e

Change-Id: I772c3f00b5e0b9d342f3308b53edadaae1f89ab9
2018-08-10 12:31:39 -07:00
Jason Monk
7e06b26b5e Merge "Adding overrides support to android_app bps" 2018-08-10 19:11:10 +00:00
Roland Levillain
3f3505ca5f Merge "Revert "Pass public API list to class2greylist tool."" 2018-08-10 18:23:17 +00:00
Roland Levillain
a86b80567a Revert "Pass public API list to class2greylist tool."
This reverts commit 9f46a30e29.

Reason for revert: This change breaks the ART Buildbot (see
https://build.chromium.org/p/client.art/builders/angler-armv7-ndebug/builds/2045/steps/build%20target/logs/stdio).

Bug: 110868826
Change-Id: I78efb71738f191b432b271f723ac83e4f02e6a0d
2018-08-10 17:55:07 +00:00
Jason Monk
87eb791c4f Adding overrides support to android_app bps
Test: build
Change-Id: I7910d042c6e7f8ac9c77e294aca11b01713d0fef
2018-08-10 13:38:57 -04:00
Mathew Inwood
6639538fd5 Merge "Pass public API list to class2greylist tool." am: edeab211d2
am: b7501daf0a

Change-Id: If40062d94456676239e80f53b3bbf06de32c81dc
2018-08-10 08:48:41 -07:00
Mathew Inwood
edeab211d2 Merge "Pass public API list to class2greylist tool." 2018-08-10 15:21:35 +00:00
Colin Cross
e49dccef0c Merge "Add soong_droiddoc_prebuilt.mk" am: 18eeb98faa
am: 3268cfb330

Change-Id: I8b450ae08a7a339a56dc88397b033c0ef51faae0
2018-08-09 13:36:20 -07:00
Colin Cross
521b22cf66 Add soong_droiddoc_prebuilt.mk
Soong droiddoc modules were using soong_java_prebuilt.mk, but they
don't need any of the java logic from it, and it includes
base_rules.mk which was not included by droiddoc.mk.  Add
soong_droiddoc_prebuilt.mk that just installs the droiddoc
outputs without including base_rules.mk.

Fixes building docs modules in mm, mma, and m checkbuild.

Bug: 112388925
Test: m docs
Change-Id: I4f7262e2c3b1afbee44c1cc306330885b687a074
2018-08-09 11:24:11 -07:00
Mathew Inwood
9f46a30e29 Pass public API list to class2greylist tool.
This is necessary to allow it to exclude synthetic bridge methods from the
generated greylist. We need to be able to apply the @UnsupportedAppUsage
annotation to regular (non-bridged) methods, but due to the SDK visibility
rules, the synthetic bridge is part of the SDK.

Bug: 110868826
Test: m
Change-Id: Iac23b0d2a9b371771a020b24191634a8b6b9b4b5
2018-08-09 11:14:10 +01:00
Bowgo Tsai
d624fa63d5 Add support for /odm partition
This CL is largely an adaptation of Change-Id
I5d229f6ac729ea6df9ff1f14cee2e28972cd9b4d

tools/vendor_buildinfo.sh is also renamed to tools/device_buildinfo.sh.
The caller then can invoke device_buildinfo.sh "vendor" | "odm" to
generate properties for vendor.img and odm.img, respectively.

It adds the following variables:

- BOARD_AVB_ODM_KEY_PATH
- BOARD_AVB_ODM_ALGORITHM
- BOARD_AVB_ODM_ROLLBACK_INDEX_LOCATION
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
- BOARD_ODMIMAGE_EXTFS_INODE_COUNT
- BOARD_ODMIMAGE_EXTFS_RSV_PCT
- BOARD_ODMIMAGE_PARTITION_SIZE
- BOARD_ODMIMAGE_JOURNAL_SIZE
- BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_PREBUILT_ODMIMAGE
- BOARD_USES_ODMIMAGE
- LOCAL_ODM_MODULE
- PRODUCT_ODM_BASE_FS_PATH
- PRODUCT_ODM_VERITY_PARTITION
- PRODUCT_ODM_PROPERTIES
- TARGET_COPY_OUT_ODM
- TARGET_OUT_ODM
- TARGET_OUT_ODM_*

Bug: 64195575
Test: boot a Taimen with existing images

Test: `make odmimage` with
      - BOARD_AVB_ENABLE := true
      - BOARD_ODMIMAGE_PARTITION_SIZE := 62914560
      - BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
      - TARGET_COPY_OUT_ODM := odm
      - PRODUCT_ODM_PROPERTIES += odm.test.build=success

Test: `make odmimage` with
      - BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 10485760
      - BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
      - BOARD_AVB_ENABLE := true
      - TARGET_COPY_OUT_ODM := odm
      - PRODUCT_ODM_PROPERTIES += odm.test.build=success
      - PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true

Change-Id: I4dea7b567ec49a766c7a4683decaf81c7e921d55
2018-08-08 18:59:44 +08:00
Nan Zhang
cb0a6881c5 Change dependency name to api-stubs-docs_annotations.zip
Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I5d4127d020eaaf58322d4ed69049bedbfe458448
Merged-In: I5d4127d020eaaf58322d4ed69049bedbfe458448
2018-08-07 16:07:59 -07:00
Colin Cross
3ebfe7309f Remove proguard support
R8 is always used now.

Bug: 111885749
Test: m checkbuild
Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-08-07 11:22:17 -07:00
Morris Lin
a77d5a2dd6 module-info.mk: Output actual module_name.
Add actual module_name information to module-info.json, and atest can
get the actual module name instead of module_name with suffix.

Bug: 77288544

Test: make -j8
      m out/target/product/generic_x86_64/module-info.json

Change-Id: I1e2dfced10db7ef5d31d26dfeb6a6c50a073a519
2018-08-07 22:17:43 +08:00
David Brazdil
a423b4be6f Merge "Make ART engs owners of core/dex_preopt*.mk" am: ad57badfdc
am: 0dcaf387cc

Change-Id: Ib79caaba3173901ae23cdadd81212aa9e5ab848c
2018-08-06 16:29:37 -07:00
David Brazdil
0dcaf387cc Merge "Make ART engs owners of core/dex_preopt*.mk"
am: ad57badfdc

Change-Id: Iba09eaf67bebe3cb0c6adb45974900c73f132cd0
2018-08-06 16:16:24 -07:00
David Brazdil
ad57badfdc Merge "Make ART engs owners of core/dex_preopt*.mk" 2018-08-06 22:57:20 +00:00
David Brazdil
6a7263eb82 Merge "hiddenapi: Split stubs into public/system/test classpaths" am: 09480aa0cf
am: d3c9855a2c

Change-Id: If62dd3722ed3f8307b3ddb1ed9b9ffca176d3e48
2018-08-06 15:37:46 -07:00
David Brazdil
d3c9855a2c Merge "hiddenapi: Split stubs into public/system/test classpaths"
am: 09480aa0cf

Change-Id: I09723c7b797e3359c8e0c6c2cd7d7dc19c0323bb
2018-08-06 15:26:57 -07:00
David Brazdil
09480aa0cf Merge "hiddenapi: Split stubs into public/system/test classpaths" 2018-08-06 21:00:04 +00:00
Isaac Chen
e0feda17dc Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" am: 451fa13fa6
am: 3085fc0c05

Change-Id: I873482e8a707ae2930e12fb4a333dbef95812e0b
2018-08-06 13:18:12 -07:00