Commit Graph

18402 Commits

Author SHA1 Message Date
Colin Cross
a113745d1f 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
Merged-In: I0e19971033d6254bfbb6555f0e68fd5e529569c6
(cherry picked from commit 579668b122)
2018-08-16 22:44:27 +00:00
Dario Freni
f31bc450d2 Add a way to override LOCAL_PRODUCT_MODULE.
This CL introduces the product variable
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION, which can contain a
list of module names to be "unmarked" from being LOCAL_PRODUCT_MODULE.

If a module name is included in this variable and if that module is
declared as LOCAL_PRODUCT_MODULE, the setting will be overriden and the
module will be installed in /system. This is useful to control this
behavior on a device-specific level.

Test: m; and checked resulting output.
Bug: 110072687
Change-Id: Iaab663a7ed757c1dd4f16169b0ac3d71650014d2
2018-08-16 18:39:12 +01:00
Treehugger Robot
7911fd3b91 Merge "Make duplicate COPY_HEADERS an error" 2018-08-16 16:33:21 +00:00
Bowgo Tsai
0ea2b1494f Merge "Add support for /odm partition"
am: c272a99b5c

Change-Id: I13e627cee909a09e0ada9f841f72c79803e765b7
2018-08-15 20:55:08 -07:00
Treehugger Robot
c272a99b5c Merge "Add support for /odm partition" 2018-08-16 03:37:36 +00:00
android-build-team Robot
54abdc0b64 Make change and version bump to PQ1A.180816.001
Change-Id: Ied6b6a68a5af75e83740a41ec7505f3babedba35
2018-08-16 03:15:52 +00:00
Dan Willemsen
346034da97 Merge "Default BUILD_BROKEN_ANDROIDMK_EXPORTS to false"
am: 78f95fa7ef

Change-Id: I5b6d69b5d2ea61f306474dc37b544d99971b0c3b
2018-08-15 17:18:40 -07:00
Dan Willemsen
7f9bd56b8a Make duplicate COPY_HEADERS an error
Test: on internal device that has warnings, test with
BUILD_BROKEN_DUP_COPY_HEADERS true and unset.
Test: build_test on downstream branches
Change-Id: I2cebd99b10f13fb75167dc8370ba762f94c41c2a
2018-08-15 15:08:15 -07:00
Dan Willemsen
738368dff5 Default BUILD_BROKEN_ANDROIDMK_EXPORTS to false
See https://android.googlesource.com/platform/build/+/master/Changes.md#export_keyword

Bug: 73959648
Test: build/soong/build_test.bash on downstream branches
Change-Id: I120e0cc381bae71101ec9ca48ee7cbe8a0b9615f
2018-08-15 20:41:56 +00:00
Tao Bao
da29ba7fe8 Merge "Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET."
am: 1fa790cb53

Change-Id: Ib850ff31e8edbf64c6c68577f78890958ec6de75
2018-08-15 11:05:29 -07:00
Tao Bao
1fa790cb53 Merge "Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET." 2018-08-15 17:59:47 +00:00
Ralph Nathan
6fa4b60c21 Merge "Allow products to define their own hidden api stubs"
am: e68ede57d7

Change-Id: Idb0bb0c7f2ac2ca848da830b90ceebe128869430
2018-08-15 10:35:10 -07:00
Tao Bao
381e9ff950 Merge "Reland "Generate the list of installed files in recovery image.""
am: 5d1b46784d

Change-Id: I3ee636b4b5f4131c8cb84e3f272a63ac58b6250c
2018-08-15 10:02:58 -07:00
Ralph Nathan
b8fb0de02f Allow products to define their own hidden api stubs
This enables other verticals/products to expand the list of APIs that
apps can call on those devices.

Bug: 112190341
Test: local test with app
Merged-In: I4dc983273a1beb83d0b81ab026945880a10bbd8c
Change-Id: I4dc983273a1beb83d0b81ab026945880a10bbd8c
(cherry picked from commit f9bf755d0a)
2018-08-15 17:51:55 +01:00
Tao Bao
5d1b46784d Merge "Reland "Generate the list of installed files in recovery image."" 2018-08-15 16:37:12 +00:00
Tao Bao
10fc949873 Reland "Generate the list of installed files in recovery image."
This reverts commit 60a47827cb to reland
the change that generates installed-files-recovery.{txt,json}.

This CL addresses the previous issue by explicitly depending on
INSTALLED_BOOTIMAGE_TARGET or INSTALLED_RECOVERYIMAGE_TARGET. This
avoids the race condition between INSTALLED_{BOOT,RECOVERY}IMAGE_TARGET
and INSTALLED_FILES_FILE_RECOVERY. As a result, it will also give a
complete list of files that are installed to recovery ramdisk image.

Bug: 30414428
Test: `m dist` with aosp_taimen-userdebug. Check the generated files of
      $OUT/installed-files-recovery.{txt,json}.
Change-Id: I8bde0dafda7d8ed9c4113dc82553c4edc7f79548
2018-08-14 23:32:32 -07:00
android-build-team Robot
8aba4494d5 Make change and version bump to PQ1A.180815.001
Change-Id: I7abbc908643d6fb7c66111b49dd7ad8a23e57ba7
2018-08-15 03:15:52 +00:00
Colin Cross
22bb86a86b Merge "Remove proguard support"
am: 72150c147e

Change-Id: I3d7b79295f0c162bb34ebdfd8f34e0735e3de2bb
2018-08-14 19:44:20 -07:00
Colin Cross
59991c71a0 Merge changes from topic "atest_java_test"
am: 1d07fbb090

Change-Id: Iac13e55edf4e96126bb6845ef9747c4c1088fcbf
2018-08-14 19:36:33 -07:00
Colin Cross
56be4aecbc Allow Soong to autogenerate test configs
am: e3a4df80c8

Change-Id: I717d8fc8f18a32a65846a020caf20a0d1975c92e
2018-08-14 19:35:41 -07:00
yangbill
7edbae731d Merge "ATest: Host native test config auto-gen support."
am: 56d08ec834

Change-Id: I78a6c5e4dcd9349b8b89be77e9090cb8a8df1fa4
2018-08-14 19:34:34 -07:00
Treehugger Robot
72150c147e Merge "Remove proguard support" 2018-08-15 01:14:45 +00:00
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
android-build-team Robot
88a5257a38 Make change and version bump to PQ1A.180814.001
Change-Id: Ic3d177140cce85ef04e57b5375527f469f13d491
2018-08-14 03:15:41 +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
Adam Seaton
61ddf1fa27 Update platform security string to 2018-10-05 on pi-dev & master
bug: 112535135
2018-08-13 09:34:24 -07: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