Commit Graph

39641 Commits

Author SHA1 Message Date
Bowgo Tsai 9a05dca429 Copy adbd from system/bin to recovery/root/sbin
This change will be submitted with other changes moving adbd from
root/sbin to system/bin. We need to copy it specifically to recovery root.
Previously it was copied by rsync $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT).

Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works

Change-Id: Ib49605f97a190aec2648cb000d1159b6e15db673
Merged-In: Ib49605f97a190aec2648cb000d1159b6e15db673
(cherry picked from commit 3147e7cfab)
2017-08-24 14:27:49 +08:00
SzuWei Lin 2cf1711b9e Reduce the system partition size of 32 bits GSI
Bug: 64458958
Test: Build pass for aosp_arm_ab and aosp_x86_ab
Change-Id: I16e66b1d1a306d7706051a899bae85441d6535ea
2017-08-24 14:14:25 +08:00
Dmitry Shmidt 8a2d761103 Merge "Set Uml if TARGET_USER_MODE_LINUX is true" am: 714f406a8a am: 2ad98c62e7
am: 31d54cb2f9

Change-Id: I9a23c572fc890882f5573b2a57b3440b536ae74d
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

Change-Id: I9e95cae6df6a6ed21ee88e17f5a605015449d4a4
2017-08-24 01:29:20 +00:00
Michael Wright 5d8410b60a O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
2017-08-23 18:23:06 -07: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 90af004fa6 Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85 am: 1c71c880e9
am: 0ed1778038

Change-Id: I82ab77f5bdae8496742b6dd2b40270d24a4b9622
2017-08-23 22:09:09 +00: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
Simran Basi 424b876778 Add shortcut to atest after envsetup.sh is sourced.
Bug: None
Test: On master, atest points to atest in tradefed.
Change-Id: Iad6e48a12c4180f77b483cadd4c316820ede87cd
2017-08-23 12:05:36 -07: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

Change-Id: I1079e882543ae448596789f4b5df25a00153a78b
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

Change-Id: Ifb63cae4b77796700b9ac87c5cd849abc38520f3
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

Change-Id: Ic1dbae77571fa5af08797683d000f1c2502e47fb
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

Change-Id: I02593920f447956a004461171665a497dfc550f9
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

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
Narayan Kamath b5c7de2c6b Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev
am: 1d2518a649

Change-Id: If80c340c6680362568ad30866686b3a60047fa14
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
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 082d9d7cf5 Merge "core: Fix typo in build rule." am: 665015ad17 am: 494e5fe856 am: 3d5dd6e4da
am: 5d8742482d

Change-Id: I6513a92f117a9231c3907bd97ea6f4335b662b6f
2017-08-23 09:59:40 +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 664484189e Merge "Split CleanSpec processing out of main Kati run" am: acb4ace77d am: f1c8fdede5 am: 57385f5ff1
am: 377e870b9e

Change-Id: I7d20339c9f6b8203ecc42108f7d38a25c517161f
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

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
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

Change-Id: I415f5940bab6d5ada6634323566eeb44de7c5769
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

Change-Id: I96eca1c8515d215e6ef8580c4b93ff4801bd35fa
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

Change-Id: I02bc8ea1a0185241c77fb9ce54a5b166a4cd3fda
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

Change-Id: I14c57342166df85cf823895944d6ebd0ade8a5c3
2017-08-22 22:53:23 +00:00
Adam Seaton d8115fb4f9 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74 am: ca22b203d0
am: 1b17813951

Change-Id: I9f2545f1f1c54edbaee396dc662111fa9b228769
2017-08-22 22:48:45 +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 bf413aa70d Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
2017-08-22 22:48:23 +00:00
Adam Seaton 50bd0fa2cc Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000 am: 55b78726b4
am: 2174b6e355

Change-Id: If6ccc8963facaa0794f51b67718b7c2770e506e0
2017-08-22 22:48:10 +00:00