Commit Graph

37895 Commits

Author SHA1 Message Date
Baligh Uddin 910e08c023 DO NOT MERGE ANYWHERE - Set MAX_PLATFORM_VERSION to OPD1 on oc-dr1-dev
Bug: 38436796
2017-06-07 10:19:42 -07:00
Dan Willemsen 9a81523e8f Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds" am: 8340ae35a7 am: c1fa14696a am: f6eef888f4
am: bd98d429ce

Change-Id: Ic8e75f2a4cb7741bbca8f2e190c58eee219290c7
2017-06-07 01:48:47 +00:00
Dan Willemsen bd98d429ce Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds" am: 8340ae35a7 am: c1fa14696a
am: f6eef888f4

Change-Id: If5cf8057c9536f05cf224a71edcd290b7347be58
2017-06-07 01:46:46 +00:00
Dan Willemsen f6eef888f4 Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds" am: 8340ae35a7
am: c1fa14696a

Change-Id: Ic7b597595a7373f6fb971860ee42de75ebeda3d2
2017-06-07 01:44:17 +00:00
Dan Willemsen c1fa14696a Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds"
am: 8340ae35a7

Change-Id: I81e05ddc32771d114d5962c5c86f97dfc4bed742
2017-06-07 01:41:47 +00:00
Treehugger Robot 8340ae35a7 Merge "Fix ALLOW_MISSING_DEPENDENCIES in PDK builds" 2017-06-07 01:34:02 +00:00
Yi Kong 9c07c3397a Merge "Switch to clang-4053586" am: 1923ed7f41 am: 7315435dce am: 1eb2339708
am: 46ba92a0d9

Change-Id: I4fc181d742236a02f94725a142b874b67ff67cff
2017-06-06 21:31:09 +00:00
Yi Kong 46ba92a0d9 Merge "Switch to clang-4053586" am: 1923ed7f41 am: 7315435dce
am: 1eb2339708

Change-Id: I70feed0bb65455848faf7accdf18a4becb4c25ed
2017-06-06 21:26:11 +00:00
Yi Kong 1eb2339708 Merge "Switch to clang-4053586" am: 1923ed7f41
am: 7315435dce

Change-Id: Ide9ecce1c40f2af538c06df9aad1263aae22ae6b
2017-06-06 21:22:05 +00:00
Yi Kong 7315435dce Merge "Switch to clang-4053586"
am: 1923ed7f41

Change-Id: I2c76b56eb40f35249c963e5757d45d32cc764a93
2017-06-06 21:17:53 +00:00
Robert Quattlebaum 22b005354f Merge "Revert "Support for android.net.lowpan and LoWPAN Service"" 2017-06-06 21:10:52 +00:00
Yi Kong 1923ed7f41 Merge "Switch to clang-4053586" 2017-06-06 21:09:43 +00:00
Ian Pedowitz 014dd199f0 Merge "Revert "Revert "OC-DR is 8.0.1""" 2017-06-06 21:05:54 +00:00
Robert Quattlebaum 350911d726 Revert "Support for android.net.lowpan and LoWPAN Service"
This reverts commit b2cbafe06e.

Change-Id: Ib78a2ff1878900508db2d3dad0704182b75e9330
2017-06-06 21:03:23 +00:00
TreeHugger Robot 3f2be14109 Merge "Support for android.net.lowpan and LoWPAN Service" 2017-06-06 20:25:55 +00:00
Ian Pedowitz 71b832169f Revert "Revert "OC-DR is 8.0.1""
This reverts commit 780cd459dc.

Bug: 62187941
Bug: 38502482
Change-Id: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
2017-06-06 15:47:48 +00:00
Tao Bao 87c354d0b1 Merge "Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3 am: d26a4099ac" into oc-dev-plus-aosp
am: a32cf235fd

Change-Id: Icccb9d1189162358937cac05444bdc5f423ca4c1
2017-06-05 23:34:40 +00:00
Tao Bao dea68afe8d Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3 am: 80e231e15f
am: ae2d38bbb4

Change-Id: Ic04d487489de45df10a2f45d1488cc63f8574a64
2017-06-05 23:34:18 +00:00
Android Build Merger (Role) a32cf235fd Merge "Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3 am: d26a4099ac" into oc-dev-plus-aosp 2017-06-05 23:29:44 +00:00
Tao Bao e008fa05b0 Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3
am: d26a4099ac

Change-Id: I99a4b8957804c0ab566246cca583b53ca01af695
2017-06-05 23:29:22 +00:00
Tao Bao ae2d38bbb4 Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3
am: 80e231e15f

Change-Id: Ib5ba23e2ffdacf99a8b41e57c3924aa92b52692a
2017-06-05 23:29:18 +00:00
Tao Bao d26a4099ac Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b
am: aeb3125ac3

Change-Id: I47c97314269744576844861badacc2736a3efa36
2017-06-05 23:23:48 +00:00
Tao Bao 80e231e15f Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b
am: aeb3125ac3

Change-Id: I84c2963d314cc0da162a6080c74d47632b9a8c6f
2017-06-05 23:23:48 +00:00
Tao Bao aeb3125ac3 Fix the broken script in AssertFingerprintOrThumbprint.
am: 9c6ab6c49b

Change-Id: I2259869457587dda3a1b3ed54d77e5a1934c8436
2017-06-05 23:18:46 +00:00
Tao Bao c3ef87f020 Merge "Fix the broken script in AssertFingerprintOrThumbprint." am: 9718140570 am: d791faf34e am: ee8a023c4e
am: 1629a7e663

Change-Id: I49a597db2460266e920a30d049304c8685f4dba7
2017-06-05 22:57:17 +00:00
Tao Bao 1629a7e663 Merge "Fix the broken script in AssertFingerprintOrThumbprint." am: 9718140570 am: d791faf34e
am: ee8a023c4e

Change-Id: I66067ffc253be23c11ff30a2805677f23105b40e
2017-06-05 22:52:15 +00:00
Tao Bao ee8a023c4e Merge "Fix the broken script in AssertFingerprintOrThumbprint." am: 9718140570
am: d791faf34e

Change-Id: I7ff3e93610855ce6382ed64cc722ffae34d39ded
2017-06-05 22:46:45 +00:00
Tao Bao d791faf34e Merge "Fix the broken script in AssertFingerprintOrThumbprint."
am: 9718140570

Change-Id: Iba0a8526407be3f06bab153776ae098379ad653e
2017-06-05 22:41:45 +00:00
Treehugger Robot 9718140570 Merge "Fix the broken script in AssertFingerprintOrThumbprint." 2017-06-05 22:33:05 +00:00
Tao Bao 6d1b2bc139 Merge "Remove three board_avb_* args from META/misc_info.txt." am: 401b1d2509 am: 6466063839 am: 26912a3a57
am: f6737d7506

Change-Id: If0c59cc150e6b8dfa90548a39ce7e5bb5ac53c7b
2017-06-05 20:29:07 +00:00
Tao Bao f6737d7506 Merge "Remove three board_avb_* args from META/misc_info.txt." am: 401b1d2509 am: 6466063839
am: 26912a3a57

Change-Id: Ief85e4efe05855b4486ed7e2f8bac22302ddd6a9
2017-06-05 20:24:06 +00:00
Tao Bao 9c6ab6c49b Fix the broken script in AssertFingerprintOrThumbprint.
Bug: 62252466
Test: Re-generate an incremental OTA that goes from the fingerprint to
      thumbprint, and check the updater-script.
Change-Id: I6e2cbf68cbd22fbcf0d200fc3fdc8a33da510a53
(cherry picked from commit d2d01e519e)
2017-06-05 13:20:42 -07:00
Tao Bao 26912a3a57 Merge "Remove three board_avb_* args from META/misc_info.txt." am: 401b1d2509
am: 6466063839

Change-Id: I239961ab6849929be67f99271c9a8d3348305bf0
2017-06-05 20:18:05 +00:00
Tao Bao 6466063839 Merge "Remove three board_avb_* args from META/misc_info.txt."
am: 401b1d2509

Change-Id: Idbd42e5a174a04c521104f92f4cbb822a49a5850
2017-06-05 20:12:05 +00:00
Treehugger Robot 401b1d2509 Merge "Remove three board_avb_* args from META/misc_info.txt." 2017-06-05 20:01:05 +00:00
Tao Bao d2d01e519e Fix the broken script in AssertFingerprintOrThumbprint.
Bug: 62252466
Test: Re-generate an incremental OTA that goes from the fingerprint to
      thumbprint, and check the updater-script.
Change-Id: I6e2cbf68cbd22fbcf0d200fc3fdc8a33da510a53
2017-06-05 12:27:52 -07:00
Tao Bao 3ebfddeabe Remove three board_avb_* args from META/misc_info.txt.
board_avb_algorithm and board_avb_key_path are overlapping with
avb_signing_args. In core/Makefile, only avb_signing_args (i.e.
INTERNAL_AVB_SIGNING_ARGS) will be used in the AVB-signing command. It
covers the contents in board_avb_{algorithm,key_path}. We should do the
same thing in tools/releasetools to avoid potential inconsistency.

This CL cleans up the logic in tools/releasetools, by always using
avb_signing_args. This also allows easier signing key replacement (so we
can replace the key/algorithm/signer in 'avb_signing_args').

board_avb_system_add_hashtree_footer_args is unused in releasetools
script, and the same information has been covered by
system_avb_add_hashtree_footer_args. This CL removes this arg as well.

Test: `m dist`. Then a) check the removed three args no longer exist in
      META/misc_info.txt; b) check that rebuilding images with
      add_img_to_target_files.py uses the same parameters.
Change-Id: I7db890b5c942de5b6868d8d1ebf937586d4729c0
2017-06-05 10:33:52 -07:00
Yi Kong dd65f96c3d Switch to clang-4053586
Bug: 37423073
Test: Build on multiple devices
Change-Id: Ic1a5f515db66275ee96fb6a614ffbb719bb91859
2017-06-02 22:13:01 -07:00
Steven Moreland 5b4571c6dd Merge "Move math function definitions." into oc-dev am: fb3424166b -s ours
am: 930d880148  -s ours

Change-Id: Id20147c84a25c3be835a4299c1f9f53596323569
2017-06-03 00:21:53 +00:00
Steven Moreland 930d880148 Merge "Move math function definitions." into oc-dev
am: fb3424166b  -s ours

Change-Id: I699f0527d58eb146686e40271aa766420dbdb99a
2017-06-03 00:18:22 +00:00
TreeHugger Robot fb3424166b Merge "Move math function definitions." into oc-dev 2017-06-03 00:15:10 +00:00
Tao Bao 534e996761 Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f -s ours am: 132566628b -s ours
am: 7db0ac5d38

Change-Id: I3d6b937b8131e2ac222f5b0d86c655f869b19a0d
2017-06-02 23:07:19 +00:00
Tao Bao a431e16270 Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f -s ours am: 2ad185af2a
am: fdbab23a98

Change-Id: I93109e88f395fb18e756af3fa74784b07b779fc4
2017-06-02 23:03:15 +00:00
Tao Bao 7db0ac5d38 Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f -s ours
am: 132566628b  -s ours

Change-Id: I75790b209f2b246deb1a71b70b07db4ab9a035df
2017-06-02 23:03:14 +00:00
Tao Bao 132566628b Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e
am: a1980abe1f  -s ours

Change-Id: I613b3f6e028acf05213db3e3765b9faf973c9976
2017-06-02 22:59:44 +00:00
Tao Bao fdbab23a98 Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e am: a1980abe1f -s ours
am: 2ad185af2a

Change-Id: Ib00c56c88f42150a7c65276c996a2e9f524ea0c9
2017-06-02 22:56:44 +00:00
Tao Bao 2ad185af2a Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev am: fccf4ec06e
am: a1980abe1f  -s ours

Change-Id: I8558172a3171d992073b34ed249e69d0f6ca33f3
2017-06-02 22:53:13 +00:00
Tao Bao a1980abe1f Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev
am: fccf4ec06e

Change-Id: If7d5b3cd4de5f558275453d0d4a599995390a4a0
2017-06-02 22:50:15 +00:00
Tao Bao 11401cee5d Merge "Support re-generating DTBO image from add_img_to_target_files.py." am: 4536e45f66 am: b88e3f20a6 am: cdabed4ee8
am: 891c29766e

Change-Id: If6aa956c2d5355c7ce0ab93cb9a2d4e93a629501
2017-06-02 22:46:44 +00:00
Tao Bao fccf4ec06e Merge "DO NOT MERGE Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""" into cw-f-dev 2017-06-02 22:42:27 +00:00