Bowgo Tsai
83f65e2621
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf am: eb7b438994 -s ours am: 68a916d4c4 -s ours
...
am: a5b0563c0d
2017-08-24 20:04:35 +00:00
Bowgo Tsai
a5b0563c0d
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf am: eb7b438994 -s ours
...
am: 68a916d4c4
2017-08-24 19:59:34 +00:00
Zach Riggle
b6bc12e00a
Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" am: 0d2a75510c am: 98025a15ab
...
am: 1e9943c392
2017-08-24 19:57:39 +00:00
Bowgo Tsai
68a916d4c4
Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
...
am: eb7b438994
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
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
2017-08-24 19:45: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
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
8a2d761103
Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a am: 2ad98c62e7
...
am: 31d54cb2f9
2017-08-24 01:34:54 +00:00
Dmitry Shmidt
31d54cb2f9
Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a
...
am: 2ad98c62e7
2017-08-24 01:29:20 +00:00
Dmitry Shmidt
2ad98c62e7
Merge "Set Uml if TARGET_USER_MODE_LINUX is true"
...
am: 714f406a8a
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
90af004fa6
Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85 am: 1c71c880e9
...
am: 0ed1778038
2017-08-23 22:09:09 +00:00
Jeff Vander Stoep
0ed1778038
Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85
...
am: 1c71c880e9
2017-08-23 22:04:12 +00:00
Jeff Vander Stoep
1c71c880e9
Merge "embedded.mk: move dependencies to sepolicy"
...
am: d6c7681d85
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)
f77f330af0
Merge "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 am: a81104f2cf" into oc-mr1-dev-plus-aosp
2017-08-23 17:08:56 +00:00
Adam Seaton
8bb37d797d
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
...
am: a81104f2cf
2017-08-23 17:08:36 +00:00
Android Build Merger (Role)
d77ffb15cd
Merge "Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992 am: 8fda58deb4" into oc-mr1-dev-plus-aosp
2017-08-23 17:08:21 +00:00
Adam Seaton
9ef278d5e4
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: bbcf3f0992
...
am: 8fda58deb4
2017-08-23 17:07:54 +00:00
Adam Seaton
59968542e3
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5 am: 269106b949
...
am: d463548af1
2017-08-23 17:07:48 +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
d463548af1
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5
...
am: 269106b949
2017-08-23 17:04:08 +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
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
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
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
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
2017-08-23 16:57:04 +00:00
Narayan Kamath
b5c7de2c6b
Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev
...
am: 1d2518a649
2017-08-23 14:28:53 +00:00
Narayan Kamath
1d2518a649
Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev
2017-08-23 14:21:31 +00:00
Narayan Kamath
082d9d7cf5
Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856 am: 3d5dd6e4da
...
am: 5d8742482d
2017-08-23 09:59:40 +00:00
Narayan Kamath
5d8742482d
Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856
...
am: 3d5dd6e4da
2017-08-23 09:56:09 +00:00
Narayan Kamath
3d5dd6e4da
Merge "core: Fix typo in build rule." am: 665015ad17
...
am: 494e5fe856
2017-08-23 09:52:39 +00:00
Narayan Kamath
494e5fe856
Merge "core: Fix typo in build rule."
...
am: 665015ad17
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
664484189e
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5 am: 57385f5ff1
...
am: 377e870b9e
2017-08-23 02:08:38 +00:00
Dan Willemsen
377e870b9e
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5
...
am: 57385f5ff1
2017-08-23 02:05:08 +00:00
Dan Willemsen
57385f5ff1
Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d
...
am: f1c8fdede5
2017-08-23 02:02:25 +00:00
Dan Willemsen
f1c8fdede5
Merge "Split CleanSpec processing out of main Kati run"
...
am: acb4ace77d
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
Android Build Merger (Role)
79d0a7ee1a
Merge "Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb am: b6a40fd0d8" into oc-mr1-dev-plus-aosp
2017-08-22 22:57:01 +00:00
Adam Seaton
32163af181
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb
...
am: b6a40fd0d8
2017-08-22 22:56:40 +00:00
Android Build Merger (Role)
57a4967789
Merge "Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb am: bf413aa70d" into oc-mr1-dev-plus-aosp
2017-08-22 22:56:38 +00:00
Adam Seaton
5934198f3a
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: f3ae135ddb
...
am: bf413aa70d
2017-08-22 22:55:36 +00:00
Android Build Merger (Role)
20db74b163
Merge "Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201 am: 6cc9494d2c" into oc-mr1-dev-plus-aosp
2017-08-22 22:54:50 +00:00
Adam Seaton
c7def27186
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201
...
am: 90b1c82d83
2017-08-22 22:53:25 +00:00
Adam Seaton
70b2f77eb4
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 834db8c201
...
am: 6cc9494d2c
2017-08-22 22:53:23 +00:00
