Commit Graph

48016 Commits

Author SHA1 Message Date
Chong Zhang 45a6fee77d Add mediaswcodec to system
bug: 111407413
Change-Id: If506a9a5b0d8eb004c802dc056cf6fd4f830a212
2018-10-05 13:35:23 -07:00
Tao Bao dc2bfe26b0 Merge "releasetools: build_image.BuildVerityTree() returns a tuple." am: 4d36fcba8c am: 589952772f
am: bf9021285a

Change-Id: I4cbaff2dac7eb0ef8882712e7823dc4575947d99
2018-10-04 07:54:23 -07:00
Tao Bao bf9021285a Merge "releasetools: build_image.BuildVerityTree() returns a tuple." am: 4d36fcba8c
am: 589952772f

Change-Id: Ie3a0e7264aa51d5cab688f2a0759983d2e184792
2018-10-04 07:46:12 -07:00
Tao Bao 589952772f Merge "releasetools: build_image.BuildVerityTree() returns a tuple."
am: 4d36fcba8c

Change-Id: Iad62f594459c73aa67bff3ad15e07e48226f300f
2018-10-04 07:41:01 -07:00
Tao Bao 4d36fcba8c Merge "releasetools: build_image.BuildVerityTree() returns a tuple." 2018-10-04 14:35:26 +00:00
Anton Hansson 1d97d35f90 Merge "Move a few more string functions to strings.mk" am: d6e5cb1add am: 21e7c05f7e
am: c0bbfed0dd

Change-Id: I7f17e606ca4d179b43e9b5dbdd41f8443b71e5ae
2018-10-04 07:17:15 -07:00
Anton Hansson c0bbfed0dd Merge "Move a few more string functions to strings.mk" am: d6e5cb1add
am: 21e7c05f7e

Change-Id: If466924b1731b8a1a2509bde65eb3493a7d0569f
2018-10-04 07:10:41 -07:00
Anton Hansson 21e7c05f7e Merge "Move a few more string functions to strings.mk"
am: d6e5cb1add

Change-Id: I20cf6bbef1c3aa05ea034ddd52e16fe2a9e87b1a
2018-10-04 07:03:28 -07:00
Anton Hansson d6e5cb1add Merge "Move a few more string functions to strings.mk" 2018-10-04 13:47:55 +00:00
Bowgo Tsai 94a6706eec Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" am: 3e795ee38b am: aba6c98fd2
am: 9b858192b7

Change-Id: I709ddec3f7f0dedd34c0992361010471002eb79c
2018-10-04 00:02:46 -07:00
Bowgo Tsai 9b858192b7 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" am: 3e795ee38b
am: aba6c98fd2

Change-Id: Ib656c67f04518e185087a94dd373afbeff95579f
2018-10-03 23:57:34 -07:00
Bowgo Tsai aba6c98fd2 Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug""
am: 3e795ee38b

Change-Id: I1f97f0e1c36115e341397bbac76d684a083198d5
2018-10-03 23:52:22 -07:00
Treehugger Robot 3e795ee38b Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" 2018-10-04 06:37:38 +00:00
Jim Tang b4c030781e Merge "Envsetup: Fix lunch choice with number in zsh" am: 2647067ae9 am: 845a588927
am: c0d20c3e93

Change-Id: I66ca3e2c54454d86e455e62643ddc8ce4876e3e7
2018-10-03 22:46:22 -07:00
Jim Tang c0d20c3e93 Merge "Envsetup: Fix lunch choice with number in zsh" am: 2647067ae9
am: 845a588927

Change-Id: Ic819bbbeadbb9e6771af69b5dc2e6e3dd414d542
2018-10-03 22:42:12 -07:00
Jim Tang 845a588927 Merge "Envsetup: Fix lunch choice with number in zsh"
am: 2647067ae9

Change-Id: Idf0dd8b06d00be9c5087c34b1887dcfdbee70673
2018-10-03 22:34:54 -07:00
Treehugger Robot 2647067ae9 Merge "Envsetup: Fix lunch choice with number in zsh" 2018-10-04 05:23:16 +00:00
Bowgo Tsai 3ac95b53f4 Revert "Fix build error for sdk_gphone_x86_64-userdebug"
This reverts commit 6924b25729.

Reason for revert: with the following fix, this workaround is no longer needed.
  https://android-review.googlesource.com/c/platform/build/+/762663

Bug: 112322265
Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8
Test: build sdk_gphone_x86_64-userdebug
2018-10-04 04:35:55 +00:00
Tao Bao 2f057467eb releasetools: build_image.BuildVerityTree() returns a tuple.
We don't need verity_root_hash or verity_salt to be in the prop dict.

Test: `m dist` with aosp_marlin-userdebug
Test: python -m unittest test_verity_utils
Change-Id: I5a9c50f4741dfb1083b3f590136335b6bc0e5216
2018-10-03 16:37:58 -07:00
Tianjie Xu e85994c1ee Merge "Generate the compute_hash_tree command" am: 08fff56237 am: ebf3195528
am: 7a4bde165d

Change-Id: Iad6d23c3c6971aff2039e2f11bc26a6b2c7a8423
2018-10-03 16:37:17 -07:00
Tianjie Xu 7a4bde165d Merge "Generate the compute_hash_tree command" am: 08fff56237
am: ebf3195528

Change-Id: I55ac9cf7964ef23296f6555792fcb59545435bfb
2018-10-03 16:29:08 -07:00
Tianjie Xu ebf3195528 Merge "Generate the compute_hash_tree command"
am: 08fff56237

Change-Id: I7453e6c367cf0ffd83e06c75c0684f3c2975a0ec
2018-10-03 16:22:55 -07:00
Tianjie Xu 08fff56237 Merge "Generate the compute_hash_tree command" 2018-10-03 23:09:15 +00:00
Tao Bao 1c3cd37337 Merge "releasetools: Raise on image building errors." am: fabb2c9792 am: db6450a6e4
am: 9ae934f9d9

Change-Id: Iaf077042013cc19026901486547bc722824e8c02
2018-10-03 14:08:09 -07:00
Tao Bao 9ae934f9d9 Merge "releasetools: Raise on image building errors." am: fabb2c9792
am: db6450a6e4

Change-Id: Iaaab2c50ded479ce7bebd94837d9610da5f27865
2018-10-03 13:53:25 -07:00
Tao Bao db6450a6e4 Merge "releasetools: Raise on image building errors."
am: fabb2c9792

Change-Id: Ice30d5a972e30302ae233dc2013c051ee287a0e7
2018-10-03 13:42:09 -07:00
Tianjie Xu 67c7cbb9c8 Generate the compute_hash_tree command
Generate the transfer command "compute_hash_tree" for incremental
updates of the non-A/B devices that enable verified boot 1.0

Other changes include:
i.  factor out verity_utils to use both in build_image and blockimgdiff
ii. add a new flag 'hashtree_info_generator' in sparse_image to generate
    the hashtree information.

Bug: 25170618
Test: generate a package for aosp_angler; and run simulator
Change-Id: I4d4d7a3e41dc3da810d2cbf8988e85d187c9ab0e
2018-10-03 13:36:35 -07:00
Tao Bao fabb2c9792 Merge "releasetools: Raise on image building errors." 2018-10-03 20:26:35 +00:00
Tao Bao c6bd70a5e6 releasetools: Raise on image building errors.
The image building functions in build_image.py have been returning
(success, result) or special values to indicate the validity of the
result. The same logic can be better expressed by raising exceptions
instead, because
 a) using a special value relies on caller to check for that magic
    value;
 b) exceptions can carry additional messages other than a boolean does,
    e.g. the output from the failing command;
 c) caller can have cleaner code flow without explicitly checking for
    the validity of the result.

This CL changes such functions to raise on errors. The majority of these
functions are internal to build_image.py only, except for BuildImage()
that has a few callers in add_img_to_target_files.py (which all die upon
error anyway).

Test: `m dist`
Test: python -m unittest test_build_image
Test: python -m unittest test_add_img_to_target_files
Test: python -m unittest test_validate_target_files
Test: Inject an error to the depended binaries (e.g. avbtool), and check
      that build_image.py exits with error messages.
Change-Id: Ibe4d51e267756bb1a00fa9238a213f9d55fd9b58
2018-10-03 11:31:44 -07:00
Anton Hansson 8478f12427 Merge "Fix TWS requirement in definitions.mk" am: ee08d635c7 am: 9920578c25
am: f07cec3b69

Change-Id: I26cd047f958930c8311e79f716e61435158a8828
2018-10-03 09:10:34 -07:00
Anton Hansson f07cec3b69 Merge "Fix TWS requirement in definitions.mk" am: ee08d635c7
am: 9920578c25

Change-Id: I28c152f91712cf266c5a54855a06865d9f896312
2018-10-03 09:06:27 -07:00
Anton Hansson 9920578c25 Merge "Fix TWS requirement in definitions.mk"
am: ee08d635c7

Change-Id: I45983ac80720fa969f953b3a7ddd312f252eb85a
2018-10-03 08:56:54 -07:00
Anton Hansson ee08d635c7 Merge "Fix TWS requirement in definitions.mk" 2018-10-03 15:41:22 +00:00
Anton Hansson 4967b34ddd Move a few more string functions to strings.mk
So they can be used in product.mk

Bug: 80410283
Test: make
Change-Id: Ic94754f6b48a3281ca1dd8c195a3410b543eb366
2018-10-03 15:59:39 +01:00
Bowgo Tsai 9a0d49bc3b Merge "Prevent AVB signing from using _RESERVED_SIZE" am: 943be51cf1 am: 09db6562ae
am: 90b5ae2ccb

Change-Id: Ifa7aaa03f8efbc1503635fefd633a12d4da89a1a
2018-10-03 07:53:40 -07:00
Bowgo Tsai 90b5ae2ccb Merge "Prevent AVB signing from using _RESERVED_SIZE" am: 943be51cf1
am: 09db6562ae

Change-Id: I02099ec5977fba86b1cf1eda7fd42b8ac219c45f
2018-10-03 07:46:28 -07:00
Bowgo Tsai 09db6562ae Merge "Prevent AVB signing from using _RESERVED_SIZE"
am: 943be51cf1

Change-Id: I23d25dd55cf41e0b0547df0b1f2a81b61f3748bd
2018-10-03 07:42:17 -07:00
Treehugger Robot 943be51cf1 Merge "Prevent AVB signing from using _RESERVED_SIZE" 2018-10-03 14:32:47 +00:00
Anton Hansson a0f91bd506 Fix TWS requirement in definitions.mk
Removing this TWS breaks the build. Add a backslash to avoid
needing it.

Test: make
Change-Id: I4f8e127218ffbf55a3e11600569f0100e914d2e2
2018-10-03 13:38:00 +01:00
Anton Hansson 70e807fa0d Merge "Add a few apps to mainline_system." am: 65fd432a91 am: 49b96de883
am: 60ee1141ee

Change-Id: I73c781d008e6ae8f2a8ded09b866231bc165a561
2018-10-03 04:03:46 -07:00
Anton Hansson 60ee1141ee Merge "Add a few apps to mainline_system." am: 65fd432a91
am: 49b96de883

Change-Id: Iaabb0478ecd0b4942ed384815728bc5d111cecab
2018-10-03 03:55:33 -07:00
Anton Hansson 49b96de883 Merge "Add a few apps to mainline_system."
am: 65fd432a91

Change-Id: I58cd4eaa082c48ac56068ca9f2bf232b571f0648
2018-10-03 03:50:25 -07:00
Jim Tang 0e3397b225 Envsetup: Fix lunch choice with number in zsh
(zsh)$ source build/envsetup.sh; lunch 23
will result in selecting #22 because array in zsh starts from 1
instead of 0. This CL is to fix this issue.

Bug: b/117202855
Test: below commands should have the same output:
    (zsh)$ source build/envsetup.sh; lunch 23
    (zsh)$ source build/envsetup.sh; lunch aosp_walleye-userdebug

Change-Id: I0570585417878bc7c73eda0e1a416232fe147fb4
2018-10-03 18:35:37 +08:00
Anton Hansson 65fd432a91 Merge "Add a few apps to mainline_system." 2018-10-03 10:32:57 +00:00
Anton Hansson bda1a14cb7 Merge "Tidy up TARGET_COPY_OUT_X variable defs" am: dd34185ae1 am: 7cf752a9dd
am: 80b4789287

Change-Id: I2e30eb3ee6807c2a95c1dc8e416b1a7f9b69aefc
2018-10-03 02:22:03 -07:00
Anton Hansson 80b4789287 Merge "Tidy up TARGET_COPY_OUT_X variable defs" am: dd34185ae1
am: 7cf752a9dd

Change-Id: Iaa72b8d0d25ba23403e8ef5f66f3e3cc045f0216
2018-10-03 02:14:54 -07:00
Anton Hansson 7cf752a9dd Merge "Tidy up TARGET_COPY_OUT_X variable defs"
am: dd34185ae1

Change-Id: Ib15c863191e5a178d5b216b05f8aebfe21c30225
2018-10-03 02:09:44 -07:00
Anton Hansson dd34185ae1 Merge "Tidy up TARGET_COPY_OUT_X variable defs" 2018-10-03 08:56:46 +00:00
Colin Cross 3028f7539c Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong" am: 9c68021f67 am: 39b2705b4b
am: d4a1dcb0c8

Change-Id: I384b77b5fe2219e170f4d22d063b7df472eabbc3
2018-10-02 21:05:44 -07:00
Colin Cross d4a1dcb0c8 Merge "Pass TARGET_PREFER_32_BIT_APPS to Soong" am: 9c68021f67
am: 39b2705b4b

Change-Id: I85d8bd12f873a50fd49268ebc92668100318a1d7
2018-10-02 20:34:50 -07:00