Commit graph

43977 commits

Author SHA1 Message Date
Adam Seaton
b703503c1d [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev
Bug:114110585
2018-09-10 16:37:40 -07:00
Elisa Pascual Trevino
c468fc20b0 Merge changes Id72175ed,I5f83105c into pi-dev
* changes:
  Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585
  Update platform security string to 2018-11-01 on pi-dev & master Bug:114110585
2018-09-10 22:56:43 +00:00
JP Sugarbroad
1d7ea5a541 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9 am: 073a48b27d
am: aebb4e4c60

Change-Id: I2454672f674809a6a30da0db4a31a2256861fa43
2018-09-10 15:10:51 -07:00
JP Sugarbroad
428cebcd7b [automerger skipped] [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 am: 58265f83b2 am: 422182a1ac
am: 839e8e5621  -s ours

Change-Id: Ib219842c69d669b83bcc8652e914425d5fe2fbec
2018-09-10 15:09:33 -07:00
JP Sugarbroad
aebb4e4c60 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9
am: 073a48b27d

Change-Id: I298dbc1500895ff6d3802008ad636f74482e2fd3
2018-09-10 15:06:18 -07:00
JP Sugarbroad
839e8e5621 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 am: 58265f83b2
am: 422182a1ac

Change-Id: Idefb550cc541e6e59c2d208b9c08fa110636def5
2018-09-10 15:05:14 -07:00
JP Sugarbroad
073a48b27d Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
am: 3266dbabf9

Change-Id: I7cb706927b8b155820c74d8c8635b4b0fac377d5
2018-09-10 15:00:53 -07:00
JP Sugarbroad
422182a1ac [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804
am: 58265f83b2

Change-Id: I7b25a2885d197236a0ad8ccd6fe53f272a5fb3b3
2018-09-10 14:59:16 -07:00
JP Sugarbroad
3266dbabf9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d skipped: 0c824a631e
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
5869cd6ac9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into cw-f-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
7728c817e3 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr1-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
6b46dac5a9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-dr1-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
4f6e887488 Merge "[RESTRICT AUTOMERGE] Remove build/libs" into nyc-dev 2018-09-10 21:49:21 +00:00
JP Sugarbroad
2ba5f007a9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr2-dev
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:20 +00:00
Elisa Pascual Trevino
dd737c0961 Update platform security string to 2018-11-05 on pi-dev & master
Bug:114110585
2018-09-06 23:06:33 +00:00
Elisa Pascual Trevino
2e6c06ba1b Update platform security string to 2018-11-01 on pi-dev & master
Bug:114110585
2018-09-06 21:50:25 +00:00
Colin Cross
a113745d1f Track more static dependencies for notice files
Track transitive static dependencies of native binaries, and
and direct and transitive static dependencies of java and app
modules.

Bug: 112331930
Test: m checkbuild
Change-Id: I0e19971033d6254bfbb6555f0e68fd5e529569c6
Merged-In: I0e19971033d6254bfbb6555f0e68fd5e529569c6
(cherry picked from commit 579668b122)
2018-08-16 22:44:27 +00:00
Adam Seaton
d8186f43a7 [automerger skipped] DO NOT MERGE Update platform security string to 2018-10-05 bug:112535135
am: 090027fb46  -s ours

Change-Id: I6d5364d1d0bcbc2960ea259a25ceeab4b24b4ead
2018-08-15 18:32:26 -07:00
Adam Seaton
090027fb46 DO NOT MERGE Update platform security string to 2018-10-05
bug:112535135
2018-08-13 18:41:41 +00:00
Adam Seaton
61ddf1fa27 Update platform security string to 2018-10-05 on pi-dev & master
bug: 112535135
2018-08-13 09:34:24 -07:00
Android Build Merger (Role)
58265f83b2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804
Change-Id: I3d887e3be355404a171b84fe02111ec35ca29887
2018-07-20 00:08:12 +00:00
Android Build Merger (Role)
428866c804 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed
Change-Id: Iec882319f93d829c4721bbeec852f5eafdec538d
2018-07-20 00:08:11 +00:00
Android Build Merger (Role)
cd5dfa01ed [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2
Change-Id: I2ef3465b53d7fdbac1ec53bd6aead997234c2d4e
2018-07-20 00:08:10 +00:00
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