Commit Graph

63915 Commits

Author SHA1 Message Date
Treehugger Robot 05c0c876f7 Merge "extract_kernel.py: add support to output compiler information" am: b83c9d0461 am: 3667804395 am: 413d074ab6 am: 516ec1733f
Original change: https://android-review.googlesource.com/c/platform/build/+/1393369

Change-Id: Ib35776c95d6e01cdff445e7fb78ef9c164592923
2020-08-11 03:45:14 +00:00
Treehugger Robot 516ec1733f Merge "extract_kernel.py: add support to output compiler information" am: b83c9d0461 am: 3667804395 am: 413d074ab6
Original change: https://android-review.googlesource.com/c/platform/build/+/1393369

Change-Id: I89ce4e1e76694947536963e16c08f1327c9a5dbc
2020-08-11 03:27:53 +00:00
Treehugger Robot 413d074ab6 Merge "extract_kernel.py: add support to output compiler information" am: b83c9d0461 am: 3667804395
Original change: https://android-review.googlesource.com/c/platform/build/+/1393369

Change-Id: I820e490566abcdd049c4e275c4b3098b4b0b0069
2020-08-11 03:08:38 +00:00
Treehugger Robot 3667804395 Merge "extract_kernel.py: add support to output compiler information" am: b83c9d0461
Original change: https://android-review.googlesource.com/c/platform/build/+/1393369

Change-Id: Iac1f9e9df8ef0a846806fa4527c129dfccd9e96b
2020-08-11 02:52:00 +00:00
Kelvin Zhang 81c1443ca5 Merge "Move non-AB OTA generation code to a separate file" am: 2f6571884d am: 0164370f52 am: f362e3ebaf am: 57d575e092
Original change: https://android-review.googlesource.com/c/platform/build/+/1378776

Change-Id: Ia19696167b2c337d9f0e00bd0bcaa487d85e93b2
2020-08-11 02:50:35 +00:00
Treehugger Robot b83c9d0461 Merge "extract_kernel.py: add support to output compiler information" 2020-08-11 02:32:23 +00:00
Kelvin Zhang 57d575e092 Merge "Move non-AB OTA generation code to a separate file" am: 2f6571884d am: 0164370f52 am: f362e3ebaf
Original change: https://android-review.googlesource.com/c/platform/build/+/1378776

Change-Id: I4980c936acdd17482f69dc8dfea1f896be27672b
2020-08-11 02:29:05 +00:00
Kelvin Zhang f362e3ebaf Merge "Move non-AB OTA generation code to a separate file" am: 2f6571884d am: 0164370f52
Original change: https://android-review.googlesource.com/c/platform/build/+/1378776

Change-Id: Id00fb7101345f504a3583849013a6ca492bb14b4
2020-08-11 02:09:38 +00:00
Kelvin Zhang 0164370f52 Merge "Move non-AB OTA generation code to a separate file" am: 2f6571884d
Original change: https://android-review.googlesource.com/c/platform/build/+/1378776

Change-Id: I49c258e9facc38440b0e59dee368ebc413796a89
2020-08-11 01:53:43 +00:00
Kelvin Zhang 2f6571884d Merge "Move non-AB OTA generation code to a separate file" 2020-08-11 01:35:23 +00:00
Bill Peckham fad9c1d4ab Merge "Fix broken my_image_variant" am: 4f353b78a7 am: b7fa8e4574 am: 138b2d0db5 am: a7320be30a
Original change: https://android-review.googlesource.com/c/platform/build/+/1393818

Change-Id: I18d639a5003572b1e3fb6ac371e062b36f3b5a6b
2020-08-10 20:47:34 +00:00
Bill Peckham a7320be30a Merge "Fix broken my_image_variant" am: 4f353b78a7 am: b7fa8e4574 am: 138b2d0db5
Original change: https://android-review.googlesource.com/c/platform/build/+/1393818

Change-Id: I5a8dfd1cd0f161b58a9d77cc5813a04f723f5f45
2020-08-10 20:29:00 +00:00
Kelvin Zhang cff4d7606d Move non-AB OTA generation code to a separate file
Test: Generate a non-AB OTA, apply it
Change-Id: I2f1afbe70d17356fcbf4d59901d201a76a3d6c4f
2020-08-10 16:22:22 -04:00
Bill Peckham 138b2d0db5 Merge "Fix broken my_image_variant" am: 4f353b78a7 am: b7fa8e4574
Original change: https://android-review.googlesource.com/c/platform/build/+/1393818

Change-Id: I1c821aa21eb0cb331caf64fa035a65eac55ce067
2020-08-10 20:07:10 +00:00
Bill Peckham b7fa8e4574 Merge "Fix broken my_image_variant" am: 4f353b78a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1393818

Change-Id: I4935d4830658c50e5b96529ef09fcf20b7ea123a
2020-08-10 19:52:11 +00:00
Bill Peckham 4f353b78a7 Merge "Fix broken my_image_variant" 2020-08-10 19:34:25 +00:00
Inseob Kim ce83956fa9 Fix broken my_image_variant
It should happen after adjusting vendor and product variables.

Bug: 162476652
Test: see image variant with LOCAL_PROPRIETARY_MODULE := true
Change-Id: I071434916c9ad18572c559a26e3ef6abb8c47303
2020-08-10 13:04:23 +09:00
Jeongik Cha 4353b01441 Merge changes from topic "b/160390776" am: 66853bb381 am: 37cd475e59 am: dd87cdea27 am: 641839880c
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: I6e96b59d5ec38c4744a16b952b5c86dbf3d27e48
2020-08-10 01:54:40 +00:00
Jeongik Cha 641839880c Merge changes from topic "b/160390776" am: 66853bb381 am: 37cd475e59 am: dd87cdea27
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: I54e002de5d1aca888086b27719dfbdab717a33ac
2020-08-10 01:39:03 +00:00
Jeongik Cha dd87cdea27 Merge changes from topic "b/160390776" am: 66853bb381 am: 37cd475e59
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: I923d490c3fb0539445cc91dadaf23686abbeca39
2020-08-10 01:25:06 +00:00
Jeongik Cha 37cd475e59 Merge changes from topic "b/160390776" am: 66853bb381
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: Iefe2a233927e9a1a4886abdca82086ac5da34d75
2020-08-10 01:08:34 +00:00
Jeongik Cha 66853bb381 Merge changes from topic "b/160390776"
* changes:
  Unset ENABLE_PREOPT when DISABLE_PREOPT is set
  Introduce TARGET_BUILD_UNBUNDLED_IMAGE
2020-08-10 00:51:56 +00:00
Yongqin Liu 2c8b8eca5e extract_kernel.py: add support to output compiler information
Test: tested with android-mainline gki kernel from
    https://android.googlesource.com/kernel/prebuilts/mainline/arm64/

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibf3eeb3679b233cd0d54501d385f442e0c0c34ec
2020-08-08 17:15:19 +08:00
Colin Cross 0b6f9874ac [automerger skipped] Merge changes I4c84d194,I696b424e am: c4e9bf20ce am: d99f49d009 -s ours am: ca65145f5a -s ours am: 65b2c1e3be -s ours
am skip reason: Change-Id I4c84d194ff5982fc57b6a8097602d4a9df68d61c with SHA-1 e73186d2ac is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392950

Change-Id: I29fb9ccc8a00cdc589ed0252f815db84525d99a8
2020-08-08 04:35:59 +00:00
wangzhou 09ebf7d344 [automerger skipped] Build NOTICE txt file into TestSuite zip package. am: e7f1725938 am: 0fba6bee06 -s ours am: 228c9aaf04 -s ours am: 9349839ffc -s ours
am skip reason: Change-Id I696b424e5f2b09d28d53ccbd9198e1f4f301ec01 with SHA-1 93d2fbbcad is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392949

Change-Id: I60d8f83b576d6a3bb17efe88760642ccd7151e53
2020-08-08 04:35:56 +00:00
Colin Cross 65b2c1e3be [automerger skipped] Merge changes I4c84d194,I696b424e am: c4e9bf20ce am: d99f49d009 -s ours am: ca65145f5a -s ours
am skip reason: Change-Id I4c84d194ff5982fc57b6a8097602d4a9df68d61c with SHA-1 e73186d2ac is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392950

Change-Id: I19ebbf405d4565c35a9201369facf6bb4c249335
2020-08-08 04:18:27 +00:00
wangzhou 9349839ffc [automerger skipped] Build NOTICE txt file into TestSuite zip package. am: e7f1725938 am: 0fba6bee06 -s ours am: 228c9aaf04 -s ours
am skip reason: Change-Id I696b424e5f2b09d28d53ccbd9198e1f4f301ec01 with SHA-1 93d2fbbcad is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392949

Change-Id: I8ad817a133b2a28600a9b153c3ed41d940a0940b
2020-08-08 04:18:25 +00:00
Colin Cross ca65145f5a [automerger skipped] Merge changes I4c84d194,I696b424e am: c4e9bf20ce am: d99f49d009 -s ours
am skip reason: Change-Id I4c84d194ff5982fc57b6a8097602d4a9df68d61c with SHA-1 e73186d2ac is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392950

Change-Id: I21904450fcea62af095f4238228bf7078073d886
2020-08-08 04:08:09 +00:00
wangzhou 228c9aaf04 [automerger skipped] Build NOTICE txt file into TestSuite zip package. am: e7f1725938 am: 0fba6bee06 -s ours
am skip reason: Change-Id I696b424e5f2b09d28d53ccbd9198e1f4f301ec01 with SHA-1 93d2fbbcad is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1392949

Change-Id: I99b3d2cfc6ef40de98922360362c59dd4dee40ac
2020-08-08 04:08:06 +00:00
Colin Cross d99f49d009 Merge changes I4c84d194,I696b424e am: c4e9bf20ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1392950

Change-Id: I19a8cadc0cc4382bc5a71fc99e43cf16b4c57233
2020-08-08 03:42:54 +00:00
wangzhou 0fba6bee06 Build NOTICE txt file into TestSuite zip package. am: e7f1725938
Original change: https://android-review.googlesource.com/c/platform/build/+/1392949

Change-Id: If475cb2e17b237a85131d010e4d7bdee7b2bce9f
2020-08-08 03:42:53 +00:00
Colin Cross c4e9bf20ce Merge changes I4c84d194,I696b424e
* changes:
  Combine HOST/TARGET in Test Suite NOTICE.
  Build NOTICE txt file into TestSuite zip package.
2020-08-08 03:29:01 +00:00
Evgenii Stepanov 4e12a16b2c Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991 am: 96af2a7adc am: 74607b7d14 am: 3a8619b535
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: I6a05642043b6973e61965ad3b828811e9485a254
2020-08-07 23:59:34 +00:00
Evgenii Stepanov 3a8619b535 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991 am: 96af2a7adc am: 74607b7d14
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: I1f921c2b4f3c9a696d1ef3fa89531142bc81afcd
2020-08-07 23:43:03 +00:00
Evgenii Stepanov 74607b7d14 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991 am: 96af2a7adc
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: I6bac23706577bf68363fd312c8164985bf358f1a
2020-08-07 23:26:33 +00:00
Evgenii Stepanov 96af2a7adc Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: Ia4561715fbe5a8e6289e107ba33063029d9dc164
2020-08-07 22:58:55 +00:00
Evgenii Stepanov 48e914e991 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." 2020-08-07 22:44:18 +00:00
Treehugger Robot 66ddf128d0 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be am: 3f4f3ce038 am: 4144c2c107 am: ac6ae01405
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: Ia15d2797761e080698cce9b66170d3161d609cc7
2020-08-07 19:18:35 +00:00
Treehugger Robot ac6ae01405 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be am: 3f4f3ce038 am: 4144c2c107
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: I0937bbcbff3ca893e996d3ca8014fe7ee9fd5227
2020-08-07 19:01:42 +00:00
Treehugger Robot 4144c2c107 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be am: 3f4f3ce038
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: I5b9948f2d8e8a416fcca0da3010f7ebc795c544f
2020-08-07 18:50:42 +00:00
Treehugger Robot 3f4f3ce038 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: I69f550073e4bc1d294970e45e77ef6bf05d06bda
2020-08-07 18:41:51 +00:00
Treehugger Robot 7c556f30be Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." 2020-08-07 18:37:36 +00:00
Evgenii Stepanov 830eddbe27 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build
Change-Id: Id1738ebc94a7c29ea9902a063f5d8dd6deb48f1b
2020-08-06 23:29:53 +00:00
Treehugger Robot 140d9ea674 Merge "Add more details to divergent vndk lib error." am: e9bceb662b am: d90ae6979a am: 34f95ab910 am: 8b0ae9a4e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: Ia060be7564a82de356b136c025562637ad37b445
2020-08-06 22:37:09 +00:00
Treehugger Robot 443369ab2e Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2 am: 2997e42efa am: e6bc570563
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: I5c83adc9b42100c0d95706d428985565ab3ff4b5
2020-08-06 22:36:35 +00:00
Treehugger Robot 8b0ae9a4e3 Merge "Add more details to divergent vndk lib error." am: e9bceb662b am: d90ae6979a am: 34f95ab910
Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: I262e3ceb03e47d1acff740483b9e981611e015b2
2020-08-06 22:08:40 +00:00
Treehugger Robot e6bc570563 Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2 am: 2997e42efa
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ibcc8c25ca9cf8737baecfda896e91c8c5225e8d0
2020-08-06 22:07:43 +00:00
Treehugger Robot 34f95ab910 Merge "Add more details to divergent vndk lib error." am: e9bceb662b am: d90ae6979a
Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: I0db9bc118a236a90a081bc6edff8e58d245f0914
2020-08-06 21:44:04 +00:00
Treehugger Robot 2997e42efa Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ib8cc3b9c920ac0fbe0001416aca16624b7f7b19c
2020-08-06 21:43:37 +00:00
Treehugger Robot d90ae6979a Merge "Add more details to divergent vndk lib error." am: e9bceb662b
Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: I9d95b7307d990b960fd0a3299be031fea8d45f13
2020-08-06 21:34:09 +00:00