Commit graph

474 commits

Author SHA1 Message Date
Yifan Hong
73ebddca75 Accept multiple input files for device manifest.
Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-05-24 16:39:02 -07:00
Isaac Chen
16ac33eef8 Merge "Generic AOSP system image for non-A/B arm devices" into oc-dev am: 66d4710933
am: 43c6e2b649

Change-Id: I4f42e58f4e88799eb44edacb00c50f210506c15a
2017-05-23 02:30:13 +00:00
Isaac Chen
1573baca1b Generic AOSP system image for non-A/B arm devices
aosp_arm_a: for non-A/B 32-bit arm devices
aosp_arm64_a: for non-A/B 64-bit arm devices
Both are based on aosp_arm64_ab (for A/B devices).

Bug: 36153731
Test: build with oc-dev and the resulted system image works on one
32-bit arm device successfully (no 64-bit arm device to test yet).
Change-Id: Ifb5c4239e5c22005e055cfa840feca9c0a92586f
2017-05-19 09:29:21 +00:00
Jeff Vander Stoep
3eed2e5808 Merge "sepolicy: remove all use of domain_deprecated" into oc-dev am: 2e8ce7628d
am: 455a336fb4

Change-Id: Iee72bbc4a37450c70b10dc1085f7ad0f856d3fb6
2017-05-16 21:49:12 +00:00
TreeHugger Robot
2e8ce7628d Merge "sepolicy: remove all use of domain_deprecated" into oc-dev 2017-05-16 21:36:39 +00:00
Jeff Vander Stoep
ec488e1fee sepolicy: remove all use of domain_deprecated
This attribute has been removed from public policy and is no longer
available.

Bug: 38316109
Test: build policy
Change-Id: I3407ced2d725de982e19b77345827de03d93c426
2017-05-15 13:25:06 -07:00
Lingfeng Yang
a70b40f60a Set emulator framebuffer display device buffer count to 3
Otherwise, we get deadlock.

bug: 36439031

Change-Id: Icffeca757120deb2b1392d8fc3531e3737d7cdc4
2017-05-09 22:36:07 +00:00
Yifan Hong
4a352c9df0 Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE
Bug: 37954458
Bug: 37321309

Test: build with lunch bullhead (PRODUCT_FULL_TREBLE=false)
Test: build with lunch marlin   (PRODUCT_FULL_TREBLE=true)
Change-Id: I2f3f8e4439e3986b9af635ac52c116f352215642
2017-05-03 16:33:23 -07:00
Yifan Hong
c9ad35ce39 Add compatibility check for system_manifest/compatibility_matrix.xml
Add compatibility check against device vintf schemas
when framework schemas are built.

Test: build with lunch marlin (that has manifest.xml)
Test: build with mini_emulator_arm64 (that doesn't have manfiest.xml)

Bug: 37321309

Change-Id: I87db152754d0185938bcef0c4395f477b8fd269b
2017-05-01 22:29:16 -07:00
Yifan Hong
b5cbe22b84 Add device/fwk compatibility matrices to device.
Also renamed matrix.xml to compatibility_matrix.xml.

Test: make and ensure vendor/compatibility_matrix.xml is there.
Test: adb shell vintf (see matrices, compatible = true)

Bug: 37321309
Change-Id: I4ebbedf47a576a50a42df53b72e507ed31ef2e56
2017-05-01 21:49:18 -07:00
Diego Wilson
77fcc43b6c Remove BOARD_USES_RECOVERY_AS_BOOT from aosp_arm64_ab
The target does not have a kernel so this flag does
not make sense.

Bug: 37443196
Test: flash aosp_arm64_ab system.img on sailfish
Change-Id: I1f22866dd5ecdd16615c02fdc8aa898b1ec2ddbd
2017-04-20 11:36:50 -07:00
Yifan Hong
aa21221f80 Use assemble_vintf to verify framework manifests.
Test: builds, and verify that system/manifest.xml is there.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: Ic3bb50211311fa423a2ad56bd2891cb57d7dc1a5
2017-04-14 16:29:55 -07:00
Yifan Hong
283af596eb Use assemble_vintf to verify device manifests.
Test: builds, and verify that vendor/manifest.xml has
sepolicy version.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: I10e4cff6ed1b78a7cb9239e822ab054e1b90e7d3
2017-04-14 16:29:04 -07:00
Michael Schwartz
4d9cb56866 Rule to copy device manifest to device
The device manifest defines the collection of HAL interfaces exposed by
the vendor. Create a common rule so each target need not define their own.

Bug: 36810913
Test: Ran marlin build and inspected file was copied
Change-Id: I9f53796fdd85e706f91664d275aff6dbd785213f
2017-04-13 08:42:42 -07:00
Steven Moreland
417fc4f445 ENABLE_TREBLE is deprecated
ENABLE_TREBLE is deprecated...removing obsolete code fragments related
to the flag.

Test: marlin boots/works
aosp_arm64_ab boots/works on sailfish/marlin

Bug: 32978887
Change-Id: I59b4509e4e7ec11cfa138200bccc4418c10b44f3
2017-04-03 12:27:51 +09:00
Jiyong Park
6fdf938751 Remove marlin/sailfish specific sepolicy
Don't use sepolicy dir for marlin/sailfish.

Bug: 36231802
Test: aosp_arm64_ab should boot
Change-Id: I0e76841530cec2c51b61251ffde802bd7ec10663
2017-03-30 14:25:41 +09:00
TreeHugger Robot
d4bcd158a5 Merge "Use HWC2 for all emulator images." 2017-03-24 21:03:37 +00:00
Jiyong Park
06241051e8 Make telephony work on generic system image
Bug: 36070427
Test: modem is up and emergency call can be made
Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265
2017-03-24 08:47:47 +00:00
Lingfeng Yang
450cd0ba62 Use HWC2 for all emulator images.
bug: 36375335

Change-Id: I1a220d7ea0174a87713e3009ceba22a5e3f66f25
2017-03-23 19:33:33 +00:00
Diego Wilson
f4efd73e96 Remove dependency on marlin sepolicy
Now that the selinux policy has been split between the system and
vendor partitions the aosp_arm64_ab build variant no longer
depends on the marlin selinux policy to work on marlin and sailfish.

Test: build and flash aosp_arm64_ab system.img on marlin and sailfish
Change-Id: I7681207284d783ffca1acccf44dbb159ea3b521c
2017-03-23 13:30:04 -04:00
Diego Wilson
a2d55b58d8 Move device specific properties to /vendor
By setting BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED on aosp_arm64_ab
the device specific properties like ro.product.board
are hosted in /vendor/build.prop.

Test: build and flash aosp_arm64_ab system.img on sailfish and marlin.
Change-Id: I8062ff81221a3026626736b012ceaf99d8ca2d12
2017-03-20 13:02:53 -07:00
bohu
7a0f58cfd7 Merge "Emulator: Enable logcat -Q to run in emulator" am: 406d3b6df1 am: 5c8080cc18
am: 4e0937222d

Change-Id: I93add2438689c5c02eb2155e68ba8514d8f8b81f
2017-03-17 16:38:34 +00:00
bohu
5c8080cc18 Merge "Emulator: Enable logcat -Q to run in emulator"
am: 406d3b6df1

Change-Id: I9f429980942e043ea874ad45bb88646d1c036f5b
2017-03-17 16:30:33 +00:00
bohu
8c3364bd59 Emulator: Enable logcat -Q to run in emulator
Create qemu_cmdline property and make sure logcat
can read it.

Change-Id: I83261a1ba29ecf9fd9b51a815425742177018c87
2017-03-15 22:27:08 -07:00
Jiyong Park
38f8aacf3b Add aosp_arm64_ab for generic system image for A/B-ready devices
aosp_arm64_ab is added as a product to build a generic system image for
all devices with ARM64 and A/B ready partitions. For now, it only
supports sailfish/marlin devices because following items are not yet
split.

- fstab
- overlays
- sepolicy

Bug: 35653062
Test: build and flash it to sailfish (or marlin)

$ source build/envsetup.sh; choosecombo 1 sailfish userdebug
$ ENABLE_EARLY_MOUNT=true ENABLE_TREBLE=true m -j 80
$ fastboot flashall
(For now, the two ENABLE_* are required to install  *.rc and *.prop
files into vendor partition. This restriction will be removed in the
future.)

$ source build/envsetup.sh; choosecombo 1 aosp_arm64_ab userdebug
$ m -j 80 systemimage
$ fastboot flash system out/target/product/generic_arm64_ab/system.img
$ fastboot -w reboot

Change-Id: Ia91163f2d51e90a488c9451cba23242887ea82ba
2017-03-09 17:14:37 +09:00
bohu
225f804e30 Emulator: set correct rild library path for 64bit arch
BUG: 34861221
Test: build and run sdk_google_phone_x86_64 with emulator
and check radio logcat to make sure it does not complain
about the 32bit library system/lib/libreference-ril.so
being used. Also check the kernel message to make sure
rild is launched properly

Change-Id: I6cbd5abcf64bec9a504066a43fefc55fa698a864
2017-02-01 12:52:48 -08:00
Yahan Zhou
ad9bf7b3e6 Increase system image size for arm64 to 2.5G to fix buildbot
This CL increases system image size for arm64 to 2.5G to fit in the
packages.

Change-Id: I5ae52c5f64e7d54b70e36bb0bce68e8197365017
2017-01-24 12:33:11 -08:00
Yahan Zhou
c363436272 Increase system image size for x64 to 2.5G
x64 uses more space than others.

Change-Id: I67674823960874164f6d40ad07c6e865eaacefc5
2017-01-24 12:33:10 -08:00
Yahan Zhou
93d1636508 Increase system image size to 2GB for the emulator
This is needed as GTS requires us to pre-install more google apps into
the system image.

Change-Id: Iaf72f745df97604c2d0bc3fbdca01730ca7be94d
2017-01-24 12:30:07 -08:00
Hiroshi Yamauchi
34826908e6 Increase the generic_arm64 system image partition size to to 2G.
Bug: 34571380
Test: build sdk_google_phone_arm64.

Change-Id: I53c8980417bfac3651d71c13111a0c1dc0022d6c
2017-01-23 10:49:43 -08:00
Lingfeng Yang
f17d83fd89 Allow /dev/goldfish_sync am: bdceef4325
am: 60a8826f53

Change-Id: I8739e950a1a6bbbd77ce0c6a320ff5d41976214b
2017-01-17 00:50:29 +00:00
Lingfeng Yang
bdceef4325 Allow /dev/goldfish_sync
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 5d6ae8a3d467dd23a2f09a96bc4fdbea2d0353a2)
2017-01-12 11:35:53 -08:00
Weilun Du
0499d282a7 Merge "Allow /dev/goldfish_sync" 2017-01-10 19:32:23 +00:00
Lingfeng Yang
ee3bd46245 Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d am: 528a561d4e am: f0069a0c7f
am: f5bb5b739a

Change-Id: I46f1077c114e1e7f972dc1823277d66b01348424
2017-01-06 20:18:51 +00:00
Lingfeng Yang
de0eaf2b7b Allow goldfish-setup to take wake locks
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
2017-01-06 10:12:08 -08:00
Lingfeng Yang
e1b174f11c Allow /dev/goldfish_sync
manual cherry pick of:
https://googleplex-android-review.git.corp.google.com/#/c/1024926/

Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 10bbf13fe7a3c2bfa28a4f560bb6f85de4edf786)
2017-01-05 18:54:59 +00:00
Mark Salyzyn
99fe879424 Merge "logpersist: introduce split to logcat and logpersist domains" am: 04f2cbd92a am: 76b36cfb98 am: 76e0e2a53e
am: f4f347cf06

Change-Id: Ib5776224c1a854c481756fb10f133aad2074fefd
2016-12-20 22:24:54 +00:00
Mark Salyzyn
239ef9d502 logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms

Test: compile
Bug: 30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
2016-12-20 20:32:01 +00:00
Richard Haines
227fa5d597 Merge "goldfish_setup: grant ifconfig priv_sock_ioctls" am: 4a0f550cc7 am: f80ed9f08e
am: d1cb2ac13a

Change-Id: Ic908915602bfdade8e3d5fadf0197f02839ea790
2016-10-20 18:03:58 +00:00
Richard Haines
f80ed9f08e Merge "goldfish_setup: grant ifconfig priv_sock_ioctls"
am: 4a0f550cc7

Change-Id: Ie7cfadf3dd2b8e0687bcfcb8f14c5234854dc727
2016-10-20 17:47:57 +00:00
Treehugger Robot
4a0f550cc7 Merge "goldfish_setup: grant ifconfig priv_sock_ioctls" 2016-10-20 17:37:43 +00:00
Richard Haines
8a09cc2297 goldfish_setup: grant ifconfig priv_sock_ioctls
The goldfish_setup shell script needs the ability to set the interface
address via ifconfig. This requires SIOCSIFADDR plus other ioctl
permissions, therefore allow the set of priv_sock_ioctls permissions.

Addresses the following denial that stops internet access via browser:
avc: denied { ioctl } for pid=712 comm="ifconfig" path="socket:[1825]"
dev="sockfs" ino=1825 ioctlcmd=8916 scontext=u:r:goldfish_setup:s0
tcontext=u:r:goldfish_setup:s0 tclass=udp_socket permissive=0

Test: With update can access internet via browser.

Change-Id: I77a52c0b72bb0ebe9451f45c346a399c1f61672d
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
2016-10-20 16:46:22 +01:00
Dan Willemsen
8134339d26 Merge "For emulator builds preopt system apps even if doing eng build" am: 6dfd788fda am: cb3991d670
am: 178d8647e1

Change-Id: I3a0938d14708568f21cdc3eb7eeb6d741b24e570
2016-10-19 18:18:06 +00:00
Dan Willemsen
cb3991d670 Merge "For emulator builds preopt system apps even if doing eng build"
am: 6dfd788fda

Change-Id: I5556244da69ca46583a63cfa83a321efa14b2381
2016-10-19 18:04:34 +00:00
Nikola Veljkovic
dcef8d3470 For emulator builds preopt system apps even if doing eng build
Following change disabled preopt for system apps when doing eng build:
    4df565786a

    Build: Only preopt boot images in eng builds

    As a middle way between full preopt/high performance/long builds,
    and no preopt/low performance/fast turnaround, preopt only the
    boot image in eng builds.

    I4a2692f3ce84823cd40c6b7d672fd73257739ef8

This works well for devices, but first boot on emulator takes 10+mins.
Bypass the change by forcing preopt inside the BoardConfig.

Change-Id: I58d100cd65d2a09b644a90d91261102aab31fcbb
2016-09-27 16:07:32 +00:00
bohu
a0e05b44a4 Emulator: increase x86_64 system image size to 2G am: 67d789a9a5 am: d84d576e9b
am: e88bd41f07

Change-Id: Ifd88c4d556da3c49495293f9785c1e0ecd012f81
2016-09-15 00:47:15 +00:00
bohu
e88bd41f07 Emulator: increase x86_64 system image size to 2G am: 67d789a9a5
am: d84d576e9b

Change-Id: I900de587d535267a4479b0e56db0aaf24278d9a8
2016-09-14 23:46:28 +00:00
bohu
67d789a9a5 Emulator: increase x86_64 system image size to 2G
Fix the build on nyc-mr1-emu-dev

Change-Id: Iae5160289c98d045096a9dae9d536df447ca18f7
2016-09-14 21:42:58 +00:00
Dan Stoza
8b0d255331 Remove DispSync default value/docs am: ae5e550f81 am: 92df306bd9
am: cddda45883

Change-Id: I3073c1f3b7d4de885519a9f0a9120069687a37d3
2016-09-12 18:03:38 +00:00
Dan Stoza
cddda45883 Remove DispSync default value/docs am: ae5e550f81
am: 92df306bd9

Change-Id: I0b21afde084512b622f74983456491749aa7c5a7
2016-09-12 17:51:17 +00:00