Commit Graph

39284 Commits

Author SHA1 Message Date
Adam Seaton b1579af4fb [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
am: 54f1f70971

Change-Id: I651ba66c05f0b9cc56b9156086d1fdcad67484e3
2017-09-13 22:49:34 +00:00
Adam Seaton eada8fa3e3 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours
am: e9263f666f

Change-Id: I5503b2599e415537b073aee6ea77b927b626fb52
2017-09-13 22:25:08 +00:00
Adam Seaton 54f1f70971 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours
am: 26bba7b920

Change-Id: Iaac09874916721ac42a237ad4e0752188ecdab8c
2017-09-13 22:24:25 +00:00
Jeff Gaston 43f3457329 Fix sdk-addon for absolute OUT_DIR
Bug: 65286453
Test: m -j OUT_DIR=/tmp/abs PRODUCT-sdk_gphone_x86-sdk_addon /tmp/abs/host/linux-x86/sdk_addon/google_phone_x86-eng.jeffrygaston-linux-x86.zip
Change-Id: Id2d18fe41de5d533baf1f082292d70d946386249
2017-09-13 15:23:38 -07:00
Tao Bao 8a7b0dee6b Merge "Consider prebuilt vendor.img as having vendor partition." 2017-09-13 22:10:43 +00:00
Adam Seaton e9263f666f [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd
am: dd45809495  -s ours

Change-Id: Ia0de479da3bf6908207d6c33ae53133a7db6b7a0
2017-09-13 22:01:01 +00:00
Adam Seaton 26bba7b920 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda
am: 6b626cb4c6  -s ours

Change-Id: I5ec186bddfd6e2d5a2acae973392f2cf2d44b87b
2017-09-13 22:00:29 +00:00
Tao Bao 2a2dbcd4b5 Consider prebuilt vendor.img as having vendor partition.
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.

For targets not using AVB, this change is no-op.

Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
      generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
Merged-In: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
(cherry picked from commit b22afea0f0)
2017-09-13 14:59:52 -07:00
Adam Seaton db4b460d4b Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Ia0a597ebe1b74390761e51481cf90a20e6376b31
2017-09-13 21:56:15 +00:00
Adam Seaton 813eb5e81d Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: Icd9ef222b91081a89b386d124eeed39d0caa6df8
2017-09-13 21:56:02 +00:00
Adam Seaton dd45809495 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8
am: 0b0e0bc4cd

Change-Id: I2676860fa74fee08c8b7572c858b4ed7bf637d60
2017-09-13 21:40:05 +00:00
Adam Seaton 6b626cb4c6 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd
am: 86e0337fda

Change-Id: I6cf99491e86212322b93f50f56a57d22c6c4de73
2017-09-13 21:39:22 +00:00
Adam Seaton 6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton 8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Steve Muckle dff8364c97 Merge "get kernel configs from kernel/configs" am: b4a3124822
am: 634ab481da

Change-Id: I89c19207e4a8792f38891e9dd88b7fcc160f6efe
2017-09-13 21:20:27 +00:00
Adam Seaton 0b0e0bc4cd [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770
am: a58425e0c8

Change-Id: I2ef9cd3f22416f41b17443eb7d6656a96033e75d
2017-09-13 21:18:21 +00:00
Adam Seaton 86e0337fda [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8
am: 8d7c08cafd

Change-Id: I4a20828070dda22489d23d4230a542824ab6af56
2017-09-13 21:16:26 +00:00
Steve Muckle 634ab481da Merge "get kernel configs from kernel/configs"
am: b4a3124822

Change-Id: Ib6a306a7bf4725e4030893bdb24d2de394fb38be
2017-09-13 21:08:28 +00:00
Adam Seaton a58425e0c8 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2
am: 59bbe44770

Change-Id: I92206f5171cd80db0029237a74924af7e4f76574
2017-09-13 20:50:38 +00:00
Adam Seaton 8d7c08cafd [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615
am: cbe21a52c8

Change-Id: I3f4f017f9b6b4686d49e180bb219dae2fecbe424
2017-09-13 20:48:56 +00:00
Tao Bao b67fd59f14 Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
am: 2998812706  -s ours

Change-Id: I58f93768b670bb5c7d8793a199c5973dc5e3e00c
2017-09-13 20:20:47 +00:00
Adam Seaton 59bbe44770 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours
am: a991b6acc2

Change-Id: I4d8f6bf1aae97821ef9fe6f107d482b06b950536
2017-09-13 20:13:41 +00:00
Adam Seaton cbe21a52c8 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379
am: 6f224a7615

Change-Id: Ie971527d3806889e9df5b6cb32ef362957ea389f
2017-09-13 20:12:59 +00:00
Adam Seaton a991b6acc2 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be
am: 33e8f674d7  -s ours

Change-Id: I8580a5f7a14491c158a3ae0902bf2ab6efa9fdeb
2017-09-13 19:48:49 +00:00
Adam Seaton 33e8f674d7 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4
am: b691e678be

Change-Id: I229b9489618e06aef683edb29c35469d4ba3ba0d
2017-09-13 19:38:15 +00:00
Steve Muckle b4a3124822 Merge "get kernel configs from kernel/configs" 2017-09-13 19:33:19 +00:00
Adam Seaton b691e678be [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64
am: 0bae3f0fa4

Change-Id: I08b259ea15a5e1798918b785e065c69156774d77
2017-09-13 19:33:16 +00:00
Adam Seaton 0bae3f0fa4 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379
am: 0c93452c64

Change-Id: I1e16c8fe0c1e00289f2730188e52cb859ba9dde1
2017-09-13 19:30:45 +00:00
Tao Bao b22afea0f0 Consider prebuilt vendor.img as having vendor partition.
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.

For targets not using AVB, this change is no-op.

Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
      generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
2017-09-13 11:05:15 -07:00
Adam Seaton d24487a2f2 Update Security String to 2017-11-05 on oc-dev bug:65631379 2017-09-13 10:51:18 -07:00
Adam Seaton 8f4a4c2131 Update Security String to 2017-11-01 on oc-dev bug:65631379 2017-09-13 10:46:41 -07:00
Adam Seaton 6f224a7615 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 2017-09-13 10:35:29 -07:00
Adam Seaton 0c93452c64 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 2017-09-13 10:31:56 -07:00
Tao Bao 2998812706 Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev 2017-09-13 17:19:09 +00:00
Steve Muckle 378c2bb42a get kernel configs from kernel/configs
The kernel configs have moved out of VTS and into their own
repository.

Test: build and boot
Change-Id: I649af63216e7b18604586f70396bceff626c30d0
2017-09-12 16:26:28 -07:00
Steven Moreland 606c19ecf8 Merge "aosp_arm64_ab is vndk" am: f38900dc92
am: 16d7c08dab

Change-Id: I27e880056b846e8781b665433c33d59268a8e670
2017-09-12 20:00:24 +00:00
Steven Moreland 16d7c08dab Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd
2017-09-12 19:48:12 +00:00
Treehugger Robot f38900dc92 Merge "aosp_arm64_ab is vndk" 2017-09-12 19:18:40 +00:00
Tianjie Xu 4ddff24f8c Merge "Add a verbose option to RunCommand in build_image.py" am: ab61b6b895
am: b34a5ce36e

Change-Id: I305f882c25ca229e3faee8b41b3ba35b79522101
2017-09-11 20:09:23 +00:00
Tianjie Xu b34a5ce36e Merge "Add a verbose option to RunCommand in build_image.py"
am: ab61b6b895

Change-Id: I7ebc5a522a76134576ab3f7ed61e2f6916d179da
2017-09-11 20:04:00 +00:00
Tianjie Xu ab61b6b895 Merge "Add a verbose option to RunCommand in build_image.py" 2017-09-11 19:22:38 +00:00
Dan Willemsen cf9b5e13b9 Merge "Convert to Android.bp" am: 65631cf079
am: 8c3849a15d

Change-Id: I9bb0b6f5f02a0f7c117228d24a013254a2a41bba
2017-09-09 22:47:46 +00:00
Dan Willemsen 8c3849a15d Merge "Convert to Android.bp"
am: 65631cf079

Change-Id: I22e6fecccd465e5f2a962168ee78c241ecb31aa2
2017-09-09 22:42:58 +00:00
Treehugger Robot 65631cf079 Merge "Convert to Android.bp" 2017-09-09 22:37:16 +00:00
Dan Willemsen c0a0f2dc1f Convert to Android.bp
Test: m atree fs_config fs_config_generate_test fs_config-unit-tests fs_get_stats zipalign
Test: cd out/host/linux-x86/nativetest64/fs_config-unit-tests ./fs_config-unit-tests
Change-Id: I3c5403a7f1cf221715eb52a41c640af9afcee175
2017-09-09 13:47:34 -07:00
Tianjie Xu 149b7fbf08 Add a verbose option to RunCommand in build_image.py
Make the build log less verbose; also print the result for
AdjustPartitionSizeForVerity().

Bug: 65292710
Test: Run add_img_to_target_files with and without "-v" and check
the logs.

Change-Id: Icdc86197ce69db036658ea9e77cc4ebe1750463b
2017-09-09 03:42:31 +00:00
Colin Cross 380d3af42f Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161
am: ec6ba0d686

Change-Id: I2fe15e8e13e118a2c4a0c507158f8f847f1e250e
2017-09-09 01:40:17 +00:00
Colin Cross ec6ba0d686 Merge "Make -ldl -lrt -lpthread implicit for host builds"
am: 952f1e5161

Change-Id: I4b540ee6dd2f9f858afc95d6ade27a6f9df1a05a
2017-09-09 01:36:02 +00:00
Treehugger Robot 952f1e5161 Merge "Make -ldl -lrt -lpthread implicit for host builds" 2017-09-09 01:32:23 +00:00
Dan Willemsen bf9c5c393a Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7
am: e931e59dc6

Change-Id: Id53f310af8dcbab58e1e57959401879eb0897a79
2017-09-08 23:51:28 +00:00