Commit graph

43954 commits

Author SHA1 Message Date
Android Build Merger (Role)
5c6df3c9a2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b
Change-Id: Ic00e7b9ba3443b444528092b1e0fba62182fb25c
2018-07-20 00:08:08 +00:00
Android Build Merger (Role)
69d914c57b [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
Change-Id: I3525350c7efdc6566fd9999e90610809c132d6b8
2018-07-20 00:08:06 +00:00
JP Sugarbroad
fd72eaab91 [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.

Bug: 109817231
Change-Id: I057957e9b201c14dee185f9c00df157f178d8a31
2018-07-20 00:08:05 +00:00
Android Build Merger (Role)
ef7d325c7f [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d skipped: 0c824a631e
Change-Id: Ifd7d207bb75af2019ddb2c0c07e93a864af9633d
2018-07-19 22:53:15 +00:00
Android Build Merger (Role)
0c824a631e [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
Change-Id: I1a5c817c43b712148c2d88398c9e27d879ded8cc
2018-07-19 22:53:14 +00:00
Android Build Merger (Role)
f74efccc8d [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
Change-Id: Ifc4833e72b81040b196bf112d249c01a8c8e9763
2018-07-19 22:53:12 +00:00
Android Build Merger (Role)
2df512843f [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
Change-Id: I6d931b90bbd08c2b7112a0ab514bca1a5f3aa044
2018-07-19 22:53:11 +00:00
Android Build Merger (Role)
41a932d505 [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
Change-Id: Iea5ed8a8a41c54f07d74e65b5babdabc166426a9
2018-07-19 22:53:09 +00:00
JP Sugarbroad
62a11cf698 [RESTRICT AUTOMERGE] Remove build/libs
There's only a single library, libhost, and it's only used by acp and
atree in build/tools, move it there.

Bug: 109817231
Change-Id: Ifa58e58958d90fad008eb87a7eef4876b57b9edd
2018-07-19 22:53:08 +00:00
Mac Wang
8c3565d98d Add product_launched_with_k.mk
Bug: 25564210
Test: None
Change-Id: I2afabf6d7720e9f1026f86598c4f6bc392a1c888
2018-07-19 14:37:41 +00:00
Adam Seaton
57c2d9f670 Updating Platform Security String to 2018-09-05 Bug: 111501777
am: 6bc223c9af

Change-Id: I588810a6254c3c14d9e4398a3be05987308e12af
2018-07-16 14:22:57 -07:00
Adam Seaton
6bc223c9af Updating Platform Security String to 2018-09-05
Bug: 111501777
2018-07-16 10:17:21 -07:00
bohu
a83fc0e482 emulator: fix a typo when copying userdata.img
replaced TARGET_CPU_ADI with TARGET_CPU_ABI

BUG: 110492064

this cl does not impact real devices

Test:
nohup make -j100 ANDROID_USE_BUILDCACHE=false PRODUCT-sdk_gphone_x86-sdk_addon showcommands dist DIST_DIR=${PWD}/dist/x86 sdk_repo
unzip the image package sdk-repo-linux-system-images-eng.zip and  make sure userdata.img is inside

Change-Id: I24101c78d789c9b72132efc41a2e98d5274b5ff1
2018-06-25 15:33:14 -07:00
Weilun Du
2276fb95cf Copy dummy userdata.img to sdk_addon images.
Avd manager in Android Studio requires userdata.img in the downloaded
system image. As we no longer inlcude the real userdata.img, we copy the
dummy userdata.img to pass the check.
This cl does not impact real devices.

BUG: 110492064
Test: Manual
1, Build with command "make -j110 PRODUCT-sdk_gphone_x86-sdk_addon".
2, Check if the dummy userdata.img appears in sdk addon image zip.
Change-Id: Icb88aac42921502288efe7355b8cd76704d5eb30
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-22 23:01:57 +00:00
Weilun Du
bd141d36a0 Merge "Increase system image size to 2.5 GB" into pi-dev 2018-06-18 23:11:40 +00:00
Adam Seaton
f53de93711 [automerger skipped] [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August Bug:109889880
am: f6bee62b8e  -s ours

Change-Id: Ib4f9aecf86cbf659a9a27d07fd03c7a799518e0e
2018-06-18 12:52:43 -07:00
Adam Seaton
f6bee62b8e [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August
Bug:109889880
2018-06-18 17:28:17 +00:00
Weilun Du
31b2f7e57f Increase system image size to 2.5 GB
Fixed build breakge caused by insufficient image size.
BUG: 110198136

Change-Id: I12a4a43b522b7867ff789854cf5b76d13f2f5499
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-17 15:37:53 -07:00
Hyunyoung Song
16e7004e3f Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
2018-06-14 16:15:23 -07:00
TreeHugger Robot
80ca83c41f Merge "emulator: base sdk_phone_armv7/64 on aosp" into pi-dev 2018-06-14 01:49:08 +00:00
TreeHugger Robot
e64b309d22 Merge "emulator: move sepolicy to goldfish project" into pi-dev 2018-06-13 22:19:14 +00:00
bohu
d7dd3e2d3d emualtor: cleanup media configuration
The media configuration is handled by goldfish/vendor.mk
already; clean them up from device.mk files.

this cl does not impact arm devices;
and it does the right thing for x86/64 devices
because the media configuration should go to vendor
instead of staying on system

BUG: 110030159
Change-Id: If492f1e01f600b1c969e9ef04598f7af6783970e
2018-06-13 22:10:51 +00:00
bohu
0d749a7a3e emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

this cl does not impact real devices, as the selinux
rules are for emulator only

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 22:09:24 +00:00
Bo Hu
941f8e102c Merge "Support new hostapd build target without HIDL" into pi-dev 2018-06-13 05:18:47 +00:00
bohu
fbde08eb07 emulator: base sdk_phone_armv7/64 on aosp
Switch to GSI images for arm/arm64 sdk images.

BUG: 79941736

This cl does not impact real device images

Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo

Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
2018-06-12 15:56:23 -07:00
bohu
6676853016 emulator: factor vendor partition out of emulator.mk
The emulator vendor paritions are better moved out of
emulator.mk into device/generic/goldfish/vendor.mk
so that changes in vendor.mk will just concentrate on
vendor partition.

this cl does not impact real devices, and it does not
even impact emulator images (it does code refactoring only)

BUG: 110030159

Change-Id: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
2018-06-12 21:49:38 +00:00
Bjoern Johansson
a2d754ce3a Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases

(cherry picked from commit a53c522678)

Change-Id: I8fa4908d1bef8ff25573abb72bbac433ae3151de
2018-06-12 11:39:00 -07:00
Nan Zhang
3af2baad0a Merge "Changed droiddoc.mk to support Metalava annotations." into pi-dev 2018-06-08 17:28:37 +00:00
Bo Hu
8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Adam Seaton
f20c71f190 Update Platform security string to 08-05 for August release
bug: 109889880
2018-06-07 14:52:58 -07:00
Yao Chen
50e6c49020 Merge "Add a system property to indicate if statsd should start" into pi-dev 2018-06-07 21:10:15 +00:00
Nan Zhang
013b0d42dd Changed droiddoc.mk to support Metalava annotations.
Test: manually cp stub-annotations.jar to pi-dev; and m -j metalava_android_stubs
Bug: b/78245848
Change-Id: If1ff99ca6d7c55a4d6880ad2fe85c66a0a62a490
Merged-In: I53bb68f7bdedd768a7e3dd7cb1c6fc18c2181b9b
2018-06-07 13:14:02 -07:00
bohu
7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
TreeHugger Robot
ff48801c0d Merge "Remove AB update in GSI" into pi-dev 2018-06-07 03:34:12 +00:00
Yao Chen
b76f355f4e Add a system property to indicate if statsd should start
Bug: 79324611
Test: manually tested on marlin_svelte
Change-Id: Id0becd80bd58806b674ac60903bad7fd39d7594b
2018-06-06 17:22:57 -07:00
Nan Zhang
d46e250b8b Merge "Change droiddoc.mk to support metalava" into pi-dev 2018-06-06 23:01:51 +00:00
Nan Zhang
d058de4a77 Change droiddoc.mk to support metalava
Test:  Manually checked-in prebuilt metalava.jar to my local src tree and
      compare the results between old and new docs/stubs generation.
Bug: b/78245848

Change-Id: Ied81cba53c483d4cfb5720e6325b299a1b32104e
Merged-In: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845
2018-06-06 13:32:54 -07:00
Tom Cherry
ef449b9250 Merge "Remove comment line in generated passwd file" into pi-dev 2018-06-06 20:06:02 +00:00
SzuWei Lin
3905b85c0a Remove AB update in GSI
Bug: 80554868
Test: Boot a pixel device with GSI applied the patch
Change-Id: If37fa2e6c2909705492863788c222b954e784741
2018-06-06 18:02:27 +08:00
Sunny Goyal
47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Wei Wang
47ca9f801f Remove comment line in generated passwd file
The man page for the password file (man 5 passwd) does not mention any
provisions for comment line other than comment field

Bug: 109748241
Test: Build and check generated file
Change-Id: I2912d0844cf3f077184129d1a0121b50b09ef1e3
2018-06-05 12:24:21 -07:00
TreeHugger Robot
b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
bohu
62d494b3fd emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
2018-06-05 00:01:36 -07:00
bohu
c5e25e9b84 emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-04 14:11:55 -07:00
TreeHugger Robot
cd42897025 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev 2018-06-04 20:43:42 +00:00
Adam Seaton
889775dff3 Merge "DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev bug: 79883349" into pi-dev 2018-06-04 18:18:18 +00:00
huans
360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Adam Seaton
97c4839717 [automerger skipped] Merge "DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349" into oc-mr1-dev
am: 64cc99f197  -s ours

Change-Id: Iee49b1a2e3b0443521e35fcda43a07b983b333a7
2018-06-04 09:55:12 -07:00
Bo Hu
63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
TreeHugger Robot
52f964deb6 Merge "Add broadcast radio service for emulator" into pi-dev 2018-06-04 13:45:18 +00:00