Isaac Chen
26704591f3
Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51
...
am: 9f55141c5f
Change-Id: Id69407d756c23a05bef58f104f547c4bf451d786
2017-08-25 02:16:51 +00:00
Isaac Chen
9f55141c5f
Merge "Revert "Revert "Build support for 32-bit armv8-a"""
...
am: 9a888ebb51
Change-Id: I4f0b7b55de9a0b79d9f81f4aaa6c04ebd1e409b1
2017-08-25 02:03:26 +00:00
Isaac Chen
9a888ebb51
Merge "Revert "Revert "Build support for 32-bit armv8-a"""
2017-08-25 01:55:56 +00:00
Yifan Hong
1c3670d185
Merge changes from topic "libvintf_cp" am: 9bab2f5fa2
...
am: 0998353f08
Change-Id: Ie8a7521d4c20f871b57267b88488add9d9c22461
2017-08-24 19:59:45 +00:00
Bowgo Tsai
a5b0563c0d
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf am: eb7b438994
-s ours
...
am: 68a916d4c4
-s ours
Change-Id: Ie49c37c212b1fefb2ada8c760a83f52324a4c3e7
2017-08-24 19:59:34 +00:00
Yifan Hong
0998353f08
Merge changes from topic "libvintf_cp"
...
am: 9bab2f5fa2
Change-Id: If2a7759c2d2f2596417814383a6a8aff91bceaa9
2017-08-24 19:53:47 +00:00
Bowgo Tsai
68a916d4c4
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
...
am: eb7b438994
-s ours
Change-Id: I7b145d16e36c42a21f40f8b5ad85dfb8f286d257
2017-08-24 19:53:21 +00:00
Zach Riggle
1e9943c392
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a75510c
...
am: 98025a15ab
Change-Id: I03ebba4e16eb1f59b278ac53b0e5eccb7e111d61
2017-08-24 19:51:32 +00:00
Zach Riggle
98025a15ab
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
...
am: 0d2a75510c
Change-Id: Ief93d3abce6191326caa9b0d19e9cd3f89bd8bfa
2017-08-24 19:45:11 +00:00
Treehugger Robot
9bab2f5fa2
Merge changes from topic "libvintf_cp"
...
* changes:
Add <kernel> entry to fwk compat mat.
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Accept multiple input files for device manifest.
2017-08-24 19:41:11 +00:00
Zach Riggle
0d2a75510c
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing"
2017-08-24 19:26:14 +00:00
Bowgo Tsai
eb7b438994
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
...
Note that this depends on a change in avbtool:
https://android-review.googlesource.com/#/c/406374/
Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong
1aecc84239
Add <kernel> entry to fwk compat mat.
...
Test: builds and verify that system/compatibility_matrix.xml
has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
is compatible with runtime info.
Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Yifan Hong
dae462bdd1
Accept multiple input files for device manifest.
...
Test: test with DEVICE_MANIFEST_FILE variable split
into multiple files
Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07:00
Dmitry Shmidt
31d54cb2f9
Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a
...
am: 2ad98c62e7
Change-Id: I9e95cae6df6a6ed21ee88e17f5a605015449d4a4
2017-08-24 01:29:20 +00:00
Dmitry Shmidt
2ad98c62e7
Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
...
am: 714f406a8a
Change-Id: I93690f777b3bc988731d6f7d26eea0d73462c562
2017-08-24 01:22:51 +00:00
Treehugger Robot
714f406a8a
Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
2017-08-24 01:14:36 +00:00
Dmitry Shmidt
82d05aaf13
Set Uml if TARGET_USER_MODE_LINUX is true
...
Bug: 64985489
Test: Manual
Change-Id: Ic472fadcf64eb04e592b6f14570f7650bcd4f2e9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-08-23 15:53:28 -07:00
Jeff Vander Stoep
0ed1778038
Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85
...
am: 1c71c880e9
Change-Id: I59157995cd6cdb5c5617da40d51c4e45f5456c41
2017-08-23 22:04:12 +00:00
Jeff Vander Stoep
1c71c880e9
Merge "embedded.mk: move dependencies to sepolicy"
...
am: d6c7681d85
Change-Id: I23df5e25c31963e3119bd38ee1d90bb70df45e08
2017-08-23 21:58:21 +00:00
Treehugger Robot
d6c7681d85
Merge "embedded.mk: move dependencies to sepolicy"
2017-08-23 21:31:31 +00:00
Android Build Merger (Role)
a81104f2cf
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
am: e53cb97dcb
-s ours am: cde553f1c5
am: 269106b949" into oc-dr1-dev-plus-aosp
2017-08-23 17:04:33 +00:00
Adam Seaton
2222ceab4d
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
am: e53cb97dcb
-s ours am: cde553f1c5
...
am: 269106b949
Change-Id: I527e6ce301180679e7f81822268979cc9261fdda
2017-08-23 17:04:06 +00:00
Adam Seaton
8fda58deb4
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
am: e53cb97dcb
-s ours am: cde553f1c5
...
am: bbcf3f0992
Change-Id: I33b7dbb55023aa49e32bda92dd7e0cf50e2fa134
2017-08-23 17:04:05 +00:00
Adam Seaton
269106b949
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
am: e53cb97dcb
-s ours
...
am: cde553f1c5
Change-Id: Ie67c88fcd12874f4728637e3c6121a8500287f0a
2017-08-23 17:01:05 +00:00
Adam Seaton
bbcf3f0992
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
am: e53cb97dcb
-s ours
...
am: cde553f1c5
Change-Id: I5d1948bcdfe214f48826597a5910d6913fe2e299
2017-08-23 17:01:05 +00:00
Adam Seaton
cde553f1c5
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
...
am: e53cb97dcb
-s ours
Change-Id: I7ba7c371d868bcfc306201ad225982893e5b2f40
2017-08-23 16:57:04 +00:00
Isaac Chen
f5af850a29
Revert "Revert "Build support for 32-bit armv8-a""
...
This reverts commit 7de79cbeaf
.
Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.
Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
lunch aosp_x86-userdebug; make -j cts
lunch aosp_sailfish-userdebug; make -j cts
lunch aosp_bullhead-userdebug; make -j cts
Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Narayan Kamath
5d8742482d
Merge "core: Fix typo in build rule." am: 665015ad17
am: 494e5fe856
...
am: 3d5dd6e4da
Change-Id: Ib4fd1006385f5a4c70b3bcff7b9fb66ee753b732
2017-08-23 09:56:09 +00:00
Narayan Kamath
3d5dd6e4da
Merge "core: Fix typo in build rule." am: 665015ad17
...
am: 494e5fe856
Change-Id: I4be385b8cfe6506d6389596f14c545c14e25f87f
2017-08-23 09:52:39 +00:00
Narayan Kamath
494e5fe856
Merge "core: Fix typo in build rule."
...
am: 665015ad17
Change-Id: Ie66f22b18d3c4f6ae33a6a2bfdbe25e1069441fe
2017-08-23 09:47:07 +00:00
Narayan Kamath
665015ad17
Merge "core: Fix typo in build rule."
2017-08-23 09:40:12 +00:00
Jeff Vander Stoep
f4941eb4a7
embedded.mk: move dependencies to sepolicy
...
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.
Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
2017-08-23 05:26:32 +00:00
Dan Willemsen
377e870b9e
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d
am: f1c8fdede5
...
am: 57385f5ff1
Change-Id: I44c20a2c3b51b4d33c3a09a192eef51059c543b4
2017-08-23 02:05:08 +00:00
Dan Willemsen
57385f5ff1
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d
...
am: f1c8fdede5
Change-Id: I344a2da1e195cadd53710173a14b68323404ca63
2017-08-23 02:02:25 +00:00
Dan Willemsen
f1c8fdede5
Merge "Split CleanSpec processing out of main Kati run"
...
am: acb4ace77d
Change-Id: I83a2bfafeff05423702d8886608c7ea91208b879
2017-08-23 02:00:13 +00:00
Treehugger Robot
acb4ace77d
Merge "Split CleanSpec processing out of main Kati run"
2017-08-23 01:53:59 +00:00
Adam Seaton
b6a40fd0d8
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
...
am: f3ae135ddb
Change-Id: I02d8e80a0a71e3d0f1d68ef7e7337f262f609708
2017-08-22 22:48:26 +00:00
Adam Seaton
6cc9494d2c
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
...
am: 834db8c201
Change-Id: Ice5d0d7b5e707aca945e1a05f6bf7b56a820a53f
2017-08-22 22:47:53 +00:00
Adam Seaton
1b17813951
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
...
am: ca22b203d0
Change-Id: I65b91c3e3acfa25af3792ddb86d9da418daaae8b
2017-08-22 22:41:59 +00:00
Adam Seaton
2174b6e355
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
...
am: 55b78726b4
Change-Id: I2454bd68b62032987f67cf00aa02f246fa097325
2017-08-22 22:41:28 +00:00
Adam Seaton
f3ae135ddb
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
...
am: ce4bc47c74
Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton
ca22b203d0
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
...
am: ce4bc47c74
Change-Id: I6b3fcb447c334206889a635178cda68f6bb20131
2017-08-22 22:37:09 +00:00
Adam Seaton
834db8c201
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
...
am: fce94e0000
Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
Adam Seaton
55b78726b4
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
...
am: fce94e0000
Change-Id: I56396b94ed83855dc0c0f86c99fffa46120b92eb
2017-08-22 22:36:22 +00:00
TreeHugger Robot
ce4bc47c74
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
2017-08-22 22:26:48 +00:00
TreeHugger Robot
fce94e0000
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
2017-08-22 22:26:42 +00:00
Zach Riggle
be0811f46c
Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing
...
Test: make m
Bug: 64903541
Change-Id: Ibb7eb126b6e68c03d0336606ec540a62a8e903d4
2017-08-22 18:01:46 -04:00
Dan Willemsen
514d49979c
Split CleanSpec processing out of main Kati run
...
Bug: 35970961
Test: m clean; m nothing; m nothing
Test: Add CleanSpec.mk line, see it executing
Change-Id: Ied59ac9dbcbeec00e1ada8271b1f66cae33edb8d
2017-08-22 13:08:24 -07:00
Adam Seaton
e53cb97dcb
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
...
am: aed422e05b
Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
2017-08-22 18:33:33 +00:00