Commit Graph

46164 Commits

Author SHA1 Message Date
Dan Willemsen d1f319bc48 Remove default BUILD_BROKEN_DUP_RULES := false
This is now false by default.

Bug: 77611511
Test: build_test on git_master
Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
2018-08-14 13:23:49 -07:00
Jack Yu 39e80afa22 Merge "Added IRadio 1.3 to VNDK" am: 7f02e5961a
am: 2203edd897

Change-Id: Id2e6ae36d938ab06c8ab0ca7f26a434df5803119
2018-08-14 12:03:02 -07:00
Tao Bao 8655414ac7 Merge "Revert "Generate the list of installed files in recovery image."" am: 8254fc122d
am: 62a5dc05af

Change-Id: Iad0a65e571909f2d3ef1b483e2006c03235e2f67
2018-08-14 12:01:55 -07:00
Jack Yu 2203edd897 Merge "Added IRadio 1.3 to VNDK"
am: 7f02e5961a

Change-Id: Ice43143f17f6669f9069be3f68b7885d136da149
2018-08-14 11:58:33 -07: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
Treehugger Robot 7f02e5961a Merge "Added IRadio 1.3 to VNDK" 2018-08-14 18:43:46 +00:00
Tao Bao 8254fc122d Merge "Revert "Generate the list of installed files in recovery image."" 2018-08-14 18:42:01 +00: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
Hridya Valsaraju 08f1e5f0b6 Merge "Allow boot control HAL to be used in recovery" am: 23d924aee3
am: 8cd64a3b5a

Change-Id: Ib3ec5e452800b96bf586e6ba59f27f9d23a29710
2018-08-14 11:11:39 -07:00
Hridya Valsaraju 8cd64a3b5a Merge "Allow boot control HAL to be used in recovery"
am: 23d924aee3

Change-Id: Ib867e5ae226a5b0b5511efcd764371c8870608e4
2018-08-14 11:07:27 -07:00
Treehugger Robot 23d924aee3 Merge "Allow boot control HAL to be used in recovery" 2018-08-14 17:53:15 +00:00
Alex Light 3c0ac46b15 Merge "Revert "Build image for clean super partition."" am: 1efb8a7a83
am: 2b73395973

Change-Id: I004b4aa32058731349f6dbd29f61ce9a8c571d7f
2018-08-14 09:53:35 -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 84ef219850 Merge "Pass public API list to class2greylist tool." am: c296e5eeb9
am: 12966aff07

Change-Id: Ia191d3efed6d8d6e700f175c39182a869efc6fbd
2018-08-14 00:41:56 -07: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
Hridya Valsaraju 06cf5dcce0 Allow boot control HAL to be used in recovery
Bug: 78793464
Test: make boot image and check if HAL is present in recovery

Change-Id: I380220c9bd716062f58e4d675d6a5f7b9460b093
2018-08-13 22:51:29 -07:00
David Anderson f8aac7b1c6 Merge "Build image for clean super partition." am: 6f08de7963
am: 70c448f6de

Change-Id: Ie1c9de8013ed56ff88ef650e373ef38cdbd94d28
2018-08-13 20:04:50 -07:00
Morris Lin c0cdebf030 Merge "module-info.mk: Output actual module_name." am: 76f68c6b0e
am: 861ac1b65e

Change-Id: Ib568a4def8ef2c55092fda4ed76ecd0ff694d1ef
2018-08-13 20:04:08 -07: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 095c9c4c55 Merge "Adding constraints for first shipping API level >= 29" am: e52846ae7f
am: f0f87a9624

Change-Id: Id060ecee3c8cb7cd739f90f82761be420ae689d3
2018-08-13 19:35:05 -07: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 0218d2af30 Merge "Merge stage-dr1-aosp-master into stage-aosp-master" into stage-aosp-master
am: 23bc1e615d

Change-Id: I52f1e57f7f6462a264bcb9f26110cdb53c2ad3aa
2018-08-13 17:10:43 -07: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 79dc85aa7c Merge "Suppress the warning when copying init.recovery.*.rc." am: a18eeb3c06
am: 6ceaf7a4e7

Change-Id: I17fbac4c224161335ec29ba25f9faab73ecc8b0c
2018-08-13 16:06:38 -07:00
Tao Bao 6ceaf7a4e7 Merge "Suppress the warning when copying init.recovery.*.rc."
am: a18eeb3c06

Change-Id: I623e77e4d23e26f458f8869fec6d6c42dd6b58ae
2018-08-13 15:49:26 -07:00
Christopher Ferris 1982f1f732 Merge "Remove micro_bench." am: 9f7e0cff7f
am: 1ae9f1836b

Change-Id: Ic0f4c197fc520e27259dfc7320aeeef694de778b
2018-08-13 15:44:30 -07:00
Treehugger Robot a18eeb3c06 Merge "Suppress the warning when copying init.recovery.*.rc." 2018-08-13 22:43:44 +00:00
Tao Bao ce22df0c2d Merge "Generate the list of installed files in recovery image." am: 9614010210
am: b1b66f2863

Change-Id: Ic959302fcd72db93f4ca3d5b2d066d0cc91f4e84
2018-08-13 15:29:39 -07:00
Christopher Ferris 1ae9f1836b Merge "Remove micro_bench."
am: 9f7e0cff7f

Change-Id: Ic42bffb6442523dc126608fc35e90ab9322f3aae
2018-08-13 15:19:22 -07:00
Christopher Ferris 9f7e0cff7f Merge "Remove micro_bench." 2018-08-13 22:11:46 +00:00
Yifan Hong 51a4613728 Add health HAL to recovery.
Add /system/lib[64]/hw/android.hardware.health@2.0-impl-default.so, so that
it can be used by recovery (instead of static linkage).

Bug: 80132328
Test: is_battery_ok works in recovery
Change-Id: I6eaf86a22bc276338cafdcf395b33e08d2366de5
2018-08-13 14:58:57 -07: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 b1b66f2863 Merge "Generate the list of installed files in recovery image."
am: 9614010210

Change-Id: Id0ab4720af49a5ba46b277b6f028d47dca724056
2018-08-13 11:22:06 -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
Hridya Valsaraju 91a7e3194b Add fastbootd to build targets
Bug: 78793464
Test: mmm
Change-Id: I0f7101d2ef948c522f8e4cfd51b91d33b59e1866
2018-08-13 10:16:27 -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
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
Chih-Hung Hsieh 90a9b22cb4 Merge "Fix print format error." am: e318a78549 am: 7279ee122f
am: 7bf1314e09

Change-Id: I78550bbbdfb65257d2f8e148bbb78a77f4c2e056
2018-08-11 13:02:27 -07:00
Chih-Hung Hsieh 7bf1314e09 Merge "Fix print format error." am: e318a78549
am: 7279ee122f

Change-Id: Ibbae0f680155b2e98c7f4be517dc6837d7f644d5
2018-08-11 12:58:49 -07:00