Commit graph

39729 commits

Author SHA1 Message Date
Adam Seaton
c6f2363c5e Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2 am: 6b7c615cb6
am: db4b460d4b

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

Change-Id: Ib1cb2b5d8789b8b43de101786ceb00d98e156afa
2017-09-13 22:15:05 +00: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
Steve Muckle
cf990d5acb Merge "get kernel configs from kernel/configs" am: b4a3124822 am: 634ab481da
am: dff8364c97

Change-Id: I812356c0ed726c563ff4443317cdb5c74055d025
2017-09-13 21:51:12 +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
Tao Bao
ad93142015 Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev am: 2998812706 -s ours
am: 6dbd8a0b8c

Change-Id: Id9e34a3b1a965c173e4fea77c5357fe8d95ceb85
2017-09-13 21:10:09 +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
Tao Bao
73a662b1df Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev am: 2998812706 -s ours
am: b67fd59f14

Change-Id: Iecb76ad0e4af41ba88b6988e447d7b5a1e2df0a0
2017-09-13 20:36:15 +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
Tao Bao
6dbd8a0b8c Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
am: 2998812706  -s ours

Change-Id: I32391594e12726a7e855d7e847da483f07c6dcd3
2017-09-13 20:09:46 +00:00
Steve Muckle
b4a3124822 Merge "get kernel configs from kernel/configs" 2017-09-13 19:33:19 +00: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
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
2db554e2b7 Merge "aosp_arm64_ab is vndk" am: f38900dc92 am: 16d7c08dab
am: 606c19ecf8

Change-Id: I94480dfdfb5a91f74d638d3851099ce37d9f3e5e
2017-09-12 22:16:27 +00: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
aca3ab70a9 Merge "Add a verbose option to RunCommand in build_image.py" am: ab61b6b895 am: b34a5ce36e
am: 4ddff24f8c

Change-Id: I1c7ce0e26193ad62c98a82fc0f695693da1fe1c2
2017-09-11 20:18:53 +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
912d2130d9 Merge "Convert to Android.bp" am: 65631cf079 am: 8c3849a15d
am: cf9b5e13b9

Change-Id: I2f3e47dddd688ded4409fd61917367a6e705aa6c
2017-09-09 22:50:18 +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
Baligh Uddin
1f3d727474 Merge "Fix the detection for compressed APKs." into oc-mr1-dev
am: 8712ac10a7

Change-Id: If14f8a180693cc1df7348c871720c69649a59daf
2017-09-09 13:24:42 +00:00
Baligh Uddin
8712ac10a7 Merge "Fix the detection for compressed APKs." into oc-mr1-dev 2017-09-09 13:20:46 +00: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
Tao Bao
0f99033b71 Fix the detection for compressed APKs.
We pack _all_ the APK certs info into META/apkcerts.txt at build time,
including the ones that are not installed for the target. When
detecting for compressed APKs, we should only count the ones that are
actually installed.

Bug: 65498015
Test: `check_target_files_signatures.py bullhead-target_files.zip`
Change-Id: I2f32d4667be0efbfd5f9365dde819f009572533d
2017-09-08 19:46:01 -07:00
Jaekyun Seok
43a1aad136 Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev
am: 777d6a036b

Change-Id: I84437cb46261553754251f40b003fa55ad569bf1
2017-09-09 02:35:34 +00:00
TreeHugger Robot
777d6a036b Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev 2017-09-09 02:28:40 +00:00
Colin Cross
df6970b8f7 Merge "Make -ldl -lrt -lpthread implicit for host builds" am: 952f1e5161 am: ec6ba0d686
am: 380d3af42f

Change-Id: I3b2834eaa62156518a1e5997a88278280e20777a
2017-09-09 01:43:34 +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
29fca0148b Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" am: c9916ddbd7 am: e931e59dc6
am: bf9c5c393a

Change-Id: Id1df276d094a94a265561f43ad572b6ba08d7cbd
2017-09-08 23:56:35 +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
Dan Willemsen
e931e59dc6 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications"
am: c9916ddbd7

Change-Id: Ide09d043908f9289d9e487ed225b3823e8773b55
2017-09-08 23:48:14 +00:00
Colin Cross
0bd335f9b0 Make -ldl -lrt -lpthread implicit for host builds
Instead of requiring every host module to specify -ldl -lrt -lpthread
and then break the mac build because -lrt doesn't exist, make them
implicit to match the behavior of modules built for the device.

Test: m -j checkbuild
Change-Id: I7b5b5289a41cd8f6e7dc2da59400955d867ee783
2017-09-08 16:43:55 -07:00
Treehugger Robot
c9916ddbd7 Merge "Remove (TARGET|HOST)_BUILD_TYPE path modifications" 2017-09-08 23:40:36 +00:00
Jaekyun Seok
f89dc8488d Revert "Support TimeZoneRulesManagerService in GSI"
This reverts commit b97fd4e603.

Bug: 65001751
Test: no tests
Change-Id: Ia48de712dff393671cd9ce4a9e040ebc16407aa9
2017-09-08 22:22:21 +00:00
Jaekyun Seok
3c8a0e0d71 Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev
am: aa7f44d4d4  -s ours

Change-Id: Ibfe2acc84b8f2985fd1ed2e73b0475ff610b93cf
2017-09-08 22:00:14 +00:00
Tao Bao
7fec55a033 Skip checking files that have less blocks in block map.
am: afee8f3036

Change-Id: I9f52d22552a6e15e926a36dfd2808a04151d8b31
2017-09-08 21:58:44 +00:00
TreeHugger Robot
aa7f44d4d4 Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev 2017-09-08 21:53:43 +00:00