Commit Graph

3415 Commits

Author SHA1 Message Date
Justin Yun c68c9a89f6 Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033 am: 9cd647af0c
am: 9b64392eb6

Change-Id: I0951744860207f061f2869c07a89877c458d9307
2017-12-21 07:10:26 +00:00
Isaac Chen d82319aa41 Merge "Use proper make variable for vendor directory" into oc-mr1-dev-plus-aosp 2017-12-21 04:25:56 +00:00
Justin Yun 9b64392eb6 Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033
am: 9cd647af0c

Change-Id: I245bbe8e7a16deb42b84599691e581c504d4615c
2017-12-21 03:01:19 +00:00
Justin Yun fc951ff268 Do not enforce VNDK on GSI if VNDK version is not set
If ro.vndk.version is not defined, use the namespace configuration
file that does not enforce VNDK restriction.
This is only for GSI.

Bug: 70704112
Test: Flash sailfish with PI and test with PI GSI image
Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
2017-12-21 08:24:36 +09:00
Isaac Chen d7a6300c94 Use proper make variable for vendor directory
Usually, we use $(TARGET_COPY_OUT_VENDOR) in make file to refer to
the vendor directory on the device.

In target/product/emulator.mk on AOSP, this make variable is used,
but in internal master, "vendor" is used! This would cause some
automerger conflict when new CLs are commited to AOSP.

Test: $ lunch aosp_x86-userdebug; m -j; emulator
Change-Id: I18667ac76d0ba3000aa361051d02e4cbb62a4f2f
2017-12-18 18:42:05 +08:00
Bo Hu 3c3992fbb3 Merge "emulator: disable location service" am: d9ee7467fd
am: 02ade23601

Change-Id: Ida38d9bc82d6e61cc3bc6db5550bfb084012ccfd
2017-12-15 19:26:08 +00:00
Bo Hu d9ee7467fd Merge "emulator: disable location service" 2017-12-15 19:14:20 +00:00
Yifan Hong 23373452d4 Merge changes from topic "fcm_version" am: b1b5a0969b
am: 5ac5e6b757

Change-Id: I5e11aa05336756b2756cb19ae8fec94ca696c2c9
2017-12-15 19:13:04 +00:00
Yifan Hong f663d1ca4d Merge "Rename VINTF XML module names" am: d8d276c5a6 am: fcdf772f67
am: d2c5a38dcb

Change-Id: I330b9c4aa322cf27ba4645c3d9a57859cb5f8ae8
2017-12-15 19:00:02 +00:00
Yifan Hong b1b5a0969b Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-15 18:58:34 +00:00
Yifan Hong d2c5a38dcb Merge "Rename VINTF XML module names" am: d8d276c5a6
am: fcdf772f67

Change-Id: Ic16692b74336cf7019b022b83c88921c756a0fe7
2017-12-15 18:57:28 +00:00
Yifan Hong 43ec6ead28 Rename VINTF XML module names
* system_compatibility_matrix/manifest.xml
   => framework_...
* compatibility_matrix/manifest.xml
   => device_...

This is to follow the naming scheme in VINTF
doc.

Test: build all four targets

Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
2017-12-14 18:19:44 -08:00
Yifan Hong ed42caf94d Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
Merged-In: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-14 15:35:15 -08:00
bohu 680ab2effb emulator: disable location service
So that watchdog does not reboot the
system because location service is not
responding.

This is just to get emulator images
booting on aosp.

BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
Merged-In: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 17:09:18 +00:00
bohu c8c807062d emulator: disable location service
So that watchdog does not reboot the
system because location service is not
responding.

This is just to get emulator images
booting on aosp.

BUG: 70378659
Change-Id: I81277208e6b9f92bb56c11b072a1f108ea964bb7
2017-12-14 09:08:42 -08:00
Yifan Hong 86f57bd9f2 Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-14 01:26:58 +00:00
TreeHugger Robot e1e61bc501 Merge "emulator: add wifi permission to emulator image" 2017-12-13 21:52:49 +00:00
Yifan Hong a7443c3bbb Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-13 12:16:17 -08:00
bohu 659104968f emulator: add wifi permission to emulator image
Right now, emulator does not have wifi support yet
but the wifi service is needed for the whole systemui
to not crash on internal master.

We have plan to enable wifi on emulator, and before
that we still want a bootable emulator image for
testing purpose.

Change-Id: I5fe2613d3678aa898b5f8ddf7875ab85dbd43314
2017-12-13 10:41:20 -08:00
Colin Cross 426ecd0f60 Merge "Replace build/tools with build/make/tools" am: 973301af79 am: e6dc6b2026
am: eb6c8444a6

Change-Id: I14d033658d219e81790ab1e730b7e477c70f4a13
2017-12-13 03:03:47 +00:00
Justin Yun 1a029f0da2 Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44 am: db00ea991d
am: ea0752140f

Change-Id: Ib0ecca7c0b324e65e8a9312423eef4deb2a6b3f5
2017-12-13 02:59:41 +00:00
Colin Cross eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Justin Yun ea0752140f Merge "Define PLATFORM_VNDK_VERSION" am: 553de17d44
am: db00ea991d

Change-Id: I351f15cc9ab934a9da95b24acb8e80410c5e93d2
2017-12-13 02:35:23 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Justin Yun 2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
SzuWei Lin 7494beccb3 Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad
am: 90cb321f88

Change-Id: I6df8c64d5fb0176b09e77eed0f90f569586814d5
2017-12-12 05:02:32 +00:00
Treehugger Robot 6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen 18c29a2ffb Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade
am: d3d7c2e180

Change-Id: I6699688bda4ed7d7b057c7a423c8622dc5065309
2017-12-12 04:35:15 +00:00
SzuWei Lin 596c026fd6 Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass and boot to home screen on a Pixel device with GSI
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166
(cherry picked from commit 7323f1d4ec)
2017-12-11 02:05:50 +00:00
SzuWei Lin 5cde531adb Add vintf into GSI
Bug: 70248004
Test: build pass and check the file in system image
Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b
2017-12-08 11:07:35 +08:00
SzuWei Lin f786f03656 Add a default apn-conf.xml into GSI
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.

Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935
2017-12-08 10:54:43 +08:00
Isaac Chen d9fed02138 Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11
(cherry picked from commit 532d5adf7b)
2017-12-07 15:03:25 +08:00
Colin Cross fdea893833 Replace build/tools with build/make/tools
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Frank Salim e9dd9fd507 Merge "Add software-only "strongbox" KM4 to goldfish." 2017-12-06 01:16:19 +00:00
Bo Hu d68768aa41 Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d am: e262a65a1d
am: 2076ee8eaf

Change-Id: Ida8fe806de355e64606885a50b5078367f446711
2017-12-05 22:15:16 +00:00
Bo Hu 2076ee8eaf Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d
am: e262a65a1d

Change-Id: Ib7e8064b3aca27c6324d002784270d015c07b9ac
2017-12-05 22:09:04 +00:00
Bo Hu e262a65a1d Merge "emulator: allows goldfish to disable bootanimation"
am: 303a5f0c2d

Change-Id: I153a54fca751889aac73ffd54fd9197188599596
2017-12-05 22:03:55 +00:00
Frank Salim 5c2b64540c Add software-only "strongbox" KM4 to goldfish.
Test: (manual) emulator boots, strongbox KM4 can start
Change-Id: I3dfb42d57c8b932954ca7c92443222e2c10ca6a4
2017-12-05 13:12:38 -08:00
bohu 7b46d578e7 emulator: allows goldfish to disable bootanimation
[    2.447332] type=1400 audit(1512424670.440:8): avc: denied { write } for pid=1408 comm="setprop" name="property_service" dev="tmpfs" ino=1216 scontext=u:r:goldfish_setup:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0
[    2.455350] init: Created socket '/dev/socket/adbd', mode 660, user 1000, group 1000
console:/ $ [    2.470594] init: Service 'ranchu-setup' (pid 1387) killed by signal 1

BUG: 70176291

Change-Id: I309ff3cb89ec01673e84fb275fe795f95711edd6
2017-12-05 09:10:16 -08:00
Isaac Chen 91f2d409c7 Merge "Enable VNDK for aosp_x86 and aosp_x86_64" 2017-12-05 04:28:48 +00:00
Justin Yun 709e4cf5b7 Merge "Check conformity of VNDK version" am: 6125d749ab am: cb8136d054
am: f4560ebb41

Change-Id: I43ba6de3e4eb87bae2d38b2c5613066f5d6d3d5e
2017-12-05 02:00:09 +00:00
Justin Yun f4560ebb41 Merge "Check conformity of VNDK version" am: 6125d749ab
am: cb8136d054

Change-Id: I4ca79f1e567d07da2b999e13a0e54070b61e2a1e
2017-12-05 01:47:43 +00:00
Justin Yun cb8136d054 Merge "Check conformity of VNDK version"
am: 6125d749ab

Change-Id: I9e4ded0975e6ba8d44658e40a59ed34a88a18c14
2017-12-05 01:38:18 +00:00
Justin Yun 9272ef87a6 Check conformity of VNDK version
Allow BOARD_VNDK_VERSION=<version> only if the prebuilt VNDK for
the <version> is provided.

If PRODUCT_EXTRA_VNDK_VERSIONS is set, all the versions in the list
will be checked as well.

Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: Set BOARD_VNDK_VERSION := current and check build
Test: Set PRODUCT_EXTRA_VNDK_VERSIONS := 27 and check if it returns
      error when prebuilts/vndk/v27/Android.mk is not provided

Change-Id: I2e43d71f1ea3717ab8c45de84c926ecc43193307
2017-12-05 10:23:44 +09:00
Bo Hu d78a7ceb7f Merge "emulator: api 26 fix guest rendering (build)" am: fb46f47085
am: c6e1046dfb

Change-Id: I5dcd84170c6f9ac7be5ef155263bfae10de93b6e
2017-12-01 20:35:40 +00:00
Bo Hu c6e1046dfb Merge "emulator: api 26 fix guest rendering (build)"
am: fb46f47085

Change-Id: Ifb7faacf00ce8af275868869e324fe25e9e9c64a
2017-12-01 20:27:37 +00:00
Lingfeng Yang 8bed4d0ce6 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
Merged-In: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-12-01 08:57:53 -08:00
Paul Duffin 21b01c5adc Merge "Switch usages of legacy-test to android.test.base" 2017-12-01 10:18:54 +00:00
Isaac Chen 532d5adf7b Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
2017-12-01 11:21:58 +08:00
bohu 5909b07cc4 Merge "emulator: support system-as-root" am: 44e363f1e3
am: 253dfc22a6

Change-Id: I9eab659873195ee7a46e8fc83556a0a5b011d746
2017-11-30 20:16:28 +00:00
bohu 253dfc22a6 Merge "emulator: support system-as-root"
am: 44e363f1e3

Change-Id: Ib1ea4ec4f388a1d28f6db2789029aa06c169c3da
2017-11-30 20:12:53 +00:00
TreeHugger Robot 9eda23256e Merge "emulator: support system-as-root" 2017-11-30 20:02:42 +00:00
Paul Duffin a840752b68 Switch usages of legacy-test to android.test.base
The legacy-test library has been deprecated in favour of the
android.test.base library which will be exposed to developers in
similar manner to android.test.runner and android.test.mock.

Bug: 30188076
Test: make checkbuild && make droid && flash
Change-Id: I36a9ccf8a1b4b7b75ce1ca4893daa3db6e660b30
2017-11-30 17:13:36 +00:00
bohu e9046cbbaa emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
Merged-In: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 22:08:28 -08:00
bohu d445fbedb4 emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 21:44:46 -08:00
TreeHugger Robot e0682e6dbe Merge "Enable VNDK runtime checking" 2017-11-29 03:55:30 +00:00
Jiyong Park 0845cb5c98 add llndk|vndksp.libraries.txt to vndk_package
Bug: 64882323
Test: build 2017 pixel devices. check the files are under /system/etc.

Merged-In: I488427f796b770bb2d151cfa49f73d323cafbc9f
Change-Id: I488427f796b770bb2d151cfa49f73d323cafbc9f
(cherry picked from commit 686aff5b91)
2017-11-23 14:35:04 +09:00
Lingfeng Yang 207413d056 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-11-22 12:45:35 -08:00
Yao Chen 44d569b130 Merge "Set the default ring buffer size for stats log, and set it loggable." am: adbaeb0c1d am: 2e006b7dc8
am: 5783f2beca

Change-Id: I8c4b41e0af440f759e783728b43b35555c0cec75
2017-11-21 19:54:46 +00:00
Yao Chen 5783f2beca Merge "Set the default ring buffer size for stats log, and set it loggable." am: adbaeb0c1d
am: 2e006b7dc8

Change-Id: I8f5cd906ce842d03c2028dfee2e4ea8ce1b84f06
2017-11-21 19:52:17 +00:00
Yao Chen 2e006b7dc8 Merge "Set the default ring buffer size for stats log, and set it loggable."
am: adbaeb0c1d

Change-Id: I86a62bad86030eb3cc3ce3d6806c56cf87a711b4
2017-11-21 19:49:36 +00:00
Treehugger Robot adbaeb0c1d Merge "Set the default ring buffer size for stats log, and set it loggable." 2017-11-21 19:44:56 +00:00
Yao Chen 8ce8dc2efa Set the default ring buffer size for stats log, and set it loggable.
Bug: 69323063
Test: manual
Change-Id: I19de884927bc4999d503b919d851048609be1470
2017-11-21 09:02:12 -08:00
SzuWei Lin 7323f1d4ec Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
2017-11-17 12:53:35 +08:00
TreeHugger Robot b0260c26ed Merge "Enlarge 32bit GSI size setting" 2017-11-15 21:40:15 +00:00
Po-Chien Hsueh 659f64fb43 Enlarge 32bit GSI size setting
Many modules are growing in size on master. 768MB is not enough for
32bit GSI anymore. Enlarge the setting to 900MB.

Bug: 69088572
Test: lunch aosp_arm_a(b); make systemimage
Change-Id: I2e93f6ef38a09a9ac7ba36f831faf57af17bbdc4
2017-11-15 23:42:33 +08:00
Xin Li 44dd4881de Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Jaekyun Seok 0d910aade0 Merge "Move system default values in system partition" am: 7c61a4eaef am: cc29444e0a
am: 9e760a3da2

Change-Id: I53de3bb413ca16c86d9d6657f6bb531f4df7b287
2017-11-14 06:08:02 +00:00
Jaekyun Seok 9e760a3da2 Merge "Move system default values in system partition" am: 7c61a4eaef
am: cc29444e0a

Change-Id: I8a9290c7d10c9f5330c9b9e3c09c00163cb8bf1b
2017-11-14 06:05:26 +00:00
Treehugger Robot 7c61a4eaef Merge "Move system default values in system partition" 2017-11-14 05:57:14 +00:00
Jaekyun Seok 4022ec99a6 Move system default values in system partition
The following properties are specified under platform/build as system
default values.

- tombstoned.max_tombstone_count
- debug.atrace.tags.enableflags
- dalvik.vm.dex2oat-minidebuginfo

So they should move into system partition.

Bug: 64661857
Test: confirmed that the default properties were stored in
/system/etc/prop.default on sailfish device
Change-Id: Ic34c05fd9761e281962b6bb425e4babedfca45a9
2017-11-14 05:43:35 +00:00
Steven Moreland c0a49f8784 Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023 am: cb71efa50a
am: 18d75a29c3

Change-Id: I2388eaf9edb0f25a4518c3b7d857404a2307189a
2017-11-13 21:18:20 +00:00
Steven Moreland 18d75a29c3 Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023
am: cb71efa50a

Change-Id: I01e7bd1eeba8ef1f9203f8d2256b862591663e9e
2017-11-13 21:14:05 +00:00
Steven Moreland 9588438023 Use PRODUCT_ENFORCE_VINTF_MANIFEST.
PRODUCT_FULL_TREBLE is being split up into smaller,
more manageable flags.

Bug: 62019611
Test: manual
Change-Id: I046f9eb4099cf441842f3d0e6908d99df063c27e
2017-11-13 09:32:24 -08:00
Dan Willemsen b6a3564609 Merge "Add PRODUCT_ADB_KEYS" am: f599f4010e am: 617dce0c29
am: 06870ee92b

Change-Id: I3691dda3888e1a49e7c1e26955b022a2f88160a4
2017-11-08 03:28:38 +00:00
Dan Willemsen 06870ee92b Merge "Add PRODUCT_ADB_KEYS" am: f599f4010e
am: 617dce0c29

Change-Id: I189f7ff9e9849fcfed1fe2b02502d105267db97a
2017-11-08 03:26:35 +00:00
Treehugger Robot f599f4010e Merge "Add PRODUCT_ADB_KEYS" 2017-11-08 03:12:17 +00:00
Jaekyun Seok 1e972a863f Merge changes from topic "system_default_prop" am: 4cb631f624 am: bc94fb4340
am: 5f035cbbde

Change-Id: I294c154385bb387bcfc81c63a86d314a30eb6bff
2017-11-08 02:22:54 +00:00
Jaekyun Seok 5f035cbbde Merge changes from topic "system_default_prop" am: 4cb631f624
am: bc94fb4340

Change-Id: I5fc7527907cce11084151643ce6b6451687faed6
2017-11-08 01:55:32 +00:00
Treehugger Robot 4cb631f624 Merge changes from topic "system_default_prop"
* changes:
  Move ART default properties into system partition
  Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
2017-11-08 01:42:40 +00:00
Jaekyun Seok 5fb6a3eb9f Move ART default properties into system partition
Bug: 64661857
Bug: 68755013
Test: confirmed that ART default properties were stored in
/system/etc/prop.default on sailfish device

Change-Id: Ie07d3049de5ac395cfb9105e208fe7825080fa15
2017-11-08 00:56:43 +00:00
Isaac Chen c72ebd8f2e Move emulator specific configurations to vendor
am: 5bf9ac508c

Change-Id: I192a2c5f41c8a0558e08e77cceb0875c290ec4cd
2017-11-07 05:37:16 +00:00
Isaac Chen 5bf9ac508c Move emulator specific configurations to vendor
The moved files are all emulator specific so should reside in vendor
directory/partition. This modification resolves a Launcher crash
issue when GSI boots on the emulator. Directly relevant file is
handheld_core_hardware.xml, which is absent from the GSI.

All other files moved in this change can cause similar issues (if they
stay under /system) since they aren't present on GSI, either.

Bug: 67987112
Test: x86 GSI boots to home screenon with 2 emulator products, aosp_x86,
      and sdk_gphone_x86 on the x86 emulator (on internal master).
      Both aosp_x86 and aosp_x86_64 boot to home screen on the emulator.
      Both aosp_arm and sdk_phone_arm boot to home screen on the arm
      emulator.

Change-Id: I2ff4f71b89d84dab322d00cf846cf06c98a1e8a7
2017-11-07 11:41:51 +08:00
Andreas Gampe 47392c41ff Merge "Build: Enable minidebuginfo generation" am: ca677112f0 am: 01e6cae2cb
am: 4e347f9dce

Change-Id: I26b0dce798b5ef5b0bf7826eeaa987deef4c7290
2017-11-06 22:07:08 +00:00
Andreas Gampe 4e347f9dce Merge "Build: Enable minidebuginfo generation" am: ca677112f0
am: 01e6cae2cb

Change-Id: I958eec8297a937f411002ba9fdab0eb852a65848
2017-11-06 22:01:47 +00:00
Treehugger Robot ca677112f0 Merge "Build: Enable minidebuginfo generation" 2017-11-06 21:45:46 +00:00
Isaac Chen 8930bf679b Merge "Move emulator specific configurations to vendor" 2017-11-06 06:18:04 +00:00
Dan Willemsen 0bd793815e Add PRODUCT_ADB_KEYS
This easily allow products to add custom adb keys for debuggable builds.
To use, provide a public key created by `adb keygen` to
PRODUCT_ADB_KEYS.

This way automated test farms don't need manual intervention to
authenticate to the device over adb, but we don't disable security for
everyone else.

Add an inherit-product-if-exists hook to aosp_* targets so that our
build servers can add a key for our test farms.

Bug: 32891559
Test: lunch aosp_marlin-userdebug; m bootimage
Test: lunch aosp_marlin-user; m bootimage
Change-Id: I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67
2017-11-03 15:57:38 -07:00
Andreas Gampe 0f3e16aad2 Build: Enable minidebuginfo generation
Enable generation of minidebuginfo through dex2oat by default.

Test: m
Test: adb shell cmd package compile -f -a
Change-Id: I70f7a1ca4939e7992ba2a7b607e8ce9bd6e0b918
2017-11-03 14:37:32 -07:00
Jin Qian 44edd9a9a1 Merge "Replace make_ext4fs with mke2fs" am: bd532fbf2e am: 3f2bf55726
am: a08e72372e

Change-Id: I3fef2c24e4795e4b9a146f1e7ee9953c3e5f5db6
2017-11-03 18:57:59 +00:00
Jin Qian a08e72372e Merge "Replace make_ext4fs with mke2fs" am: bd532fbf2e
am: 3f2bf55726

Change-Id: I413967d1e6f479d8899e906aa4a5d597107c77de
2017-11-03 18:03:20 +00:00
Jin Qian bd532fbf2e Merge "Replace make_ext4fs with mke2fs" 2017-11-03 17:28:57 +00:00
Jin Qian 95b2b695cd Replace make_ext4fs with mke2fs
make_ext4fs is deprecated and should be replaced with mke2fs

Bug: 64395169
Change-Id: Idfc8c0ee0ff598fdaa6f20bb0d4f6dca687a1b10
2017-11-02 16:27:41 -07:00
Treehugger Robot 1c505a1985 Merge "Set the default value of pm.dexopt.shared to speed" 2017-11-02 18:13:54 +00:00
Dan Willemsen 165ede37ad Merge "Revert "Add adb keys to debuggable AOSP builds"" am: 40fae9ca0f am: 438a8b800a
am: be48f9de21

Change-Id: I5bc89c0401a9c0535d105ae08cf4cdc62de8241e
2017-11-02 17:26:55 +00:00
Dan Willemsen be48f9de21 Merge "Revert "Add adb keys to debuggable AOSP builds"" am: 40fae9ca0f
am: 438a8b800a

Change-Id: I32ff3e53910b0d162a4aa40ae0111589f979a053
2017-11-02 17:24:48 +00:00
Calin Juravle 89836f119e Set the default value of pm.dexopt.shared to speed
By default, we should compile all shared apks with the speed filter.

(cherry picked from commit 3fdb549931)

Bug: 65591595
Test: build & boot
Merged-In: I8781ca47090321a32641ec4c7a4ed3c722bab475
Change-Id: I8781ca47090321a32641ec4c7a4ed3c722bab475
2017-11-02 09:33:39 -07:00
Tobias Thierer e76e3837cd Revert "Add adb keys to debuggable AOSP builds"
This reverts commit 6d4536023b.

Reason for revert: Suspected to have broken build_test on master:

build/make/core/tasks/vendor_module_check.mk:108: error: Error: vendor module "adb_keys" in vendor/google/security/adb in product "aosp_lionhead" being installed to out/multiproduct-20171102103809/aosp_lionhead/target/product/lionhead/root/adb_keys which is not in the vendor tree or odm tree.

Change-Id: If7c1c9f08604b1dfc1036ea6fe3cb487fafc3cf0
2017-11-02 15:16:17 +00:00
Isaac Chen 2b063ee55d Move emulator specific configurations to vendor
The moved files are all emulator specific so should reside in vendor
directory/partition. This modification resolves a Launcher crash
issue when GSI boots on the emulator. Directly relevant file is
handheld_core_hardware.xml, which is absent from the GSI.

All other files moved in this change can cause similar issues (if they
stay under /system) since they aren't present on GSI, either.

Bug: 67987112
Test: x86 GSI boots to home screenon with 2 emulator products, aosp_x86,
      and sdk_gphone_x86 on the x86 emulator (on internal master).
      Both aosp_x86 and aosp_x86_64 boot to home screen on the emulator.
      Both aosp_arm and sdk_phone_arm boot to home screen on the arm
      emulator.

Change-Id: I2ff4f71b89d84dab322d00cf846cf06c98a1e8a7
2017-11-02 19:08:58 +08:00
Dan Willemsen a2221a5824 Merge "Add adb keys to debuggable AOSP builds" am: 40cd480454 am: ccdbf9866c
am: b2830040b4

Change-Id: I944c70d920353bd7f31560566a31c25f58aa6a5b
2017-11-02 01:07:39 +00:00
Dan Willemsen b2830040b4 Merge "Add adb keys to debuggable AOSP builds" am: 40cd480454
am: ccdbf9866c

Change-Id: Ie1c8c729b47cfeb070f899db97b759cbe4b1abd7
2017-11-02 01:03:16 +00:00
Dan Willemsen 6d4536023b Add adb keys to debuggable AOSP builds
These don't exist on AOSP itself, but if they're added in, debuggable
builds will include the keys. This way automated test farms don't need
manual intervention to authenticate to the device over adb, but we don't
disable security for everyone else.

Bug: 32891559
Test: lunch aosp_marlin-userdebug; m
Change-Id: I59011a5c1f45b0c8bd5c2355d2b4c3671f5da4e4
2017-11-01 15:04:11 -07:00
Shubham Ajmera c5966a35ca Add compiler filter for inactive app downgrade
(cherry picked from commit 572a3df7fc)

Bug: 36598475
Test: Verified the property value on the device
Merged-In: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
Change-Id: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
2017-10-31 10:03:14 -07:00
Sunny Goyal c65540bccf Switching build to use Launcher3 instead of Launcher2
Bug: 67984089
Test: it builds
Change-Id: I92a6e4852d6367f5c42fc5e9686487a793b71afe
2017-10-31 09:25:53 -07:00
Justin Yun ef4f57af4a resolve merge conflicts of eb247544a7 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib0c5ade0a1db65491b21226d5a2686ff6cf32d74
2017-10-31 15:27:52 +09:00
Justin Yun 83c8f78e00 Use vndk-sp phony module for vndk-sp package list
To install the vndk-sp libraries defined in device/generic/common,
use vndk-sp phony module to list the libraries.

Bug: 65853349
Test: build aosp_x86-user and check emulator boot
Change-Id: Idf2d421b5d84e04e332db9cb357a46c898a89c4e
(cherry picked from commit 740c6a3c7c)
2017-10-31 11:32:52 +09:00
Mathieu Chartier b5ecb6581a Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common am: 99b2739a66
am: 356d58009c

Change-Id: I7c319ae376e0a6d7b094ad6629dffef757d9e508
2017-10-30 16:20:42 +00:00
Mathieu Chartier 356d58009c Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common
am: 99b2739a66

Change-Id: I24d503bc735a231b5e39c5a0745c3dacfdc64a15
2017-10-30 16:09:15 +00:00
bohu 30b232885a emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: I85dfbc3acdcbdf0431d4657c7d664ac4c781736b
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-10-26 16:45:05 -07:00
bohu 97252db917 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I332bc4dfa958f5213a8650c7314963b6bf33d519
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-10-26 16:45:05 -07:00
bohu 813249bfdf emulator: squash misc modifications from oc-emu-dev
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:45:05 -07:00
bohu 4a6cc6a8fc emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: Ib25ae4a1c7f86ef20a45af2f88732067ad95c5f4
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-10-26 16:45:05 -07:00
bohu 179849ade7 sdk:enable emulator to launch in build environment
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.

This CL set those up as part of the build process.

Change-Id: Iccaea540b2a27f45fd487dd25408b5d5c047171c
Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-10-26 16:45:05 -07:00
bohu cb0bebbeda build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I7f5317d52e552367a1390789fe7ce6e0955ba8de
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-10-26 16:45:05 -07:00
Yahan Zhou 3afe69d846 Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I330adc6da2999031d4ed2d8c4ade4667c1d0b511
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-10-26 16:45:05 -07:00
Justin Yun 740c6a3c7c Use vndk-sp phony module for vndk-sp package list
To install the vndk-sp libraries defined in device/generic/common,
use vndk-sp phony module to list the libraries.

Bug: 65853349
Test: build aosp_x86-user and check emulator boot
Change-Id: Idf2d421b5d84e04e332db9cb357a46c898a89c4e
2017-10-25 21:02:42 +09:00
Mathieu Chartier 99b2739a66 Add PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to go_defaults_common
Strip the local variable table and the local variable type table to
reduce the size of the system image. This has no bearing on stack
traces, but will leave less information available via JDWP

Bug: 67374015
Test: make and flash
Change-Id: Ie592221b893f7fa7433fe10e8c08ff70b5de4e47
2017-10-24 14:57:08 -07:00
Yabin Cui cba9c4af34 Merge "Use armv7-a when building sdk." am: 42c9da3ef7 am: 18b83792e3
am: ad216f840f

Change-Id: I02ca577a73dfdea7e846c46828ca166c3572185a
2017-10-24 21:34:32 +00:00
Yabin Cui ad216f840f Merge "Use armv7-a when building sdk." am: 42c9da3ef7
am: 18b83792e3

Change-Id: If44428f4df666fadf446aede178eb572f3f2a4e1
2017-10-24 21:32:01 +00:00
Yabin Cui 42c9da3ef7 Merge "Use armv7-a when building sdk." 2017-10-24 21:18:33 +00:00
Tri Vo 3904285fab Merge "Label emulator devicetree dir." am: 8716646d63 am: 73d36f64b1
am: 7fd5858547

Change-Id: Ib518ea518a10cb6133b886594e6ca9f5bb75aa70
2017-10-24 20:55:53 +00:00
Tri Vo 7fd5858547 Merge "Label emulator devicetree dir." am: 8716646d63
am: 73d36f64b1

Change-Id: I3945cb34c9d41a2834b1da85a980ac335bf2fa58
2017-10-24 20:45:38 +00:00
Tri Vo 8716646d63 Merge "Label emulator devicetree dir." 2017-10-24 20:36:22 +00:00
Yabin Cui 1fe7ac7534 Use armv7-a when building sdk.
Bug: http://b/68201917
Test: make sdk.
Change-Id: I7817bc03beb109b4152d3bc751f0d2438cc93e3b
2017-10-24 12:44:13 -07:00
Andreas Gampe 91516ba4e7 Merge "Go: Disable libartd by default" into oc-mr1-dev am: 8e813f3ebb
am: a33b7a5750

Change-Id: If4b93519d03e98af9775ade0baed0133581c7140
2017-10-24 03:47:25 +00:00
Andreas Gampe a33b7a5750 Merge "Go: Disable libartd by default" into oc-mr1-dev
am: 8e813f3ebb

Change-Id: Ib10234f8627d9a5146ea7bf20541a0bcfd91ddb2
2017-10-24 03:42:23 +00:00
Jiyong Park 9b78f70dbb Merge "Freeze VNDK lib list on release platforms" am: f636d065bd am: 5099d1a340 am: 7883234e51
am: 1b49e70b9c

Change-Id: Iad989808b4f2f121a05074fec772fa19789b0537
2017-10-23 02:13:02 +00:00
Jiyong Park 1b49e70b9c Merge "Freeze VNDK lib list on release platforms" am: f636d065bd am: 5099d1a340
am: 7883234e51

Change-Id: If9f63ce6c21e4d3c754c3d980e9f8a374ba851a2
2017-10-23 02:10:26 +00:00
Jiyong Park 7883234e51 Merge "Freeze VNDK lib list on release platforms" am: f636d065bd
am: 5099d1a340

Change-Id: I028dd277044bd4a206be69962a01fd6e76f0cccb
2017-10-23 02:07:51 +00:00
Jiyong Park 5099d1a340 Merge "Freeze VNDK lib list on release platforms"
am: f636d065bd

Change-Id: I926ed105da6627f03d614a1d8196c35bdc378eaf
2017-10-23 02:05:14 +00:00
Treehugger Robot f636d065bd Merge "Freeze VNDK lib list on release platforms" 2017-10-23 02:01:06 +00:00
Jiyong Park 3b6c916194 Freeze VNDK lib list on release platforms
The list of VNDK libraries that exist in the source tree is compared
against the latest known list. If they are different, build breaks.

The latest list can be updated by running update-vndk-list.sh but it
is allowed only for development branches (i.e. PLATFORM_VERSION_CODENAME
!= REL).

Bug: 67002788
Test: build 2017 pixel devices
Test: m check-vndk-list
Test: update-vndk-list.sh
Change-Id: I4bae2b647c045b11ac7d587fab48067bf53a7cf4
2017-10-22 18:05:44 +09:00
Colin Cross 2377f23d44 Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f am: 4ffa2e1ebc
am: 40be14c239

Change-Id: I126f1387ad66bace815d7a8bd3f46357cb39e7f2
2017-10-21 00:01:42 +00:00
Colin Cross 40be14c239 Merge "Update references to build/core to build/make/core" am: 6db8597174 am: bce301801f
am: 4ffa2e1ebc

Change-Id: I9ff0a8d8e2abd407935e691be324894a5da09f8c
2017-10-20 23:53:47 +00:00
Colin Cross 4ffa2e1ebc Merge "Update references to build/core to build/make/core" am: 6db8597174
am: bce301801f

Change-Id: Ia79b01150eea31e95eb40dddb0209d6ec12a1ff1
2017-10-20 23:51:13 +00:00
Colin Cross bce301801f Merge "Update references to build/core to build/make/core"
am: 6db8597174

Change-Id: I4be5bc1805d1900991966d24fda15f2705ee248d
2017-10-20 23:49:17 +00:00
Colin Cross 6db8597174 Merge "Update references to build/core to build/make/core" 2017-10-20 23:41:12 +00:00
Tri Vo e275275d31 Label emulator devicetree dir.
Bug: 67416435
Test: booted emulator and checked that
/sys/bus/platform/devices/ANDR0001:00/properties/android/ is labeled
as sysfs_dt_firmware_android
Change-Id: Ib90552b1ccaa8ddcc389e6829221ba63075df7ed
2017-10-20 16:26:22 -07:00
Colin Cross 6cdc5d20f3 Update references to build/core to build/make/core
sed -i -e 's"\([^/]\)build/core"\1build/make/core"g' $(git grep -l build/core)

Test: m checkbuild
Change-Id: Idf3a2fed79aee5d2c07bd8e42f0c0660f253ddc2
2017-10-20 12:49:28 -07:00
Andreas Gampe 6bb2743b8b Go: Disable libartd by default
Free up some space in userdebug to make consistent with user. Go
doesn't have enough resources, really, anyways.

Frees up about 9M.

Bug: 62087184
Test: lunch gobo-userdebug && m && ls $OUT/system/lib/libartd*
Change-Id: I109bbbc59b71de48ca63ba64142148a50fb0af55
2017-10-19 11:42:44 -07:00
SzuWei Lin 45e36d65d3 Merge "Add make_f2fs into GSI" into oc-mr1-dev am: 4c06d64955
am: 00033a8bfd

Change-Id: Ib307b99e429907e1dccdfd7e4e9911abbfee9e5b
2017-10-19 18:00:35 +00:00
SzuWei Lin 00033a8bfd Merge "Add make_f2fs into GSI" into oc-mr1-dev
am: 4c06d64955

Change-Id: I4a055848eb7652ecc567b9036976510b42a4fb5d
2017-10-19 17:41:34 +00:00
Bowgo Tsai 1583dd2c87 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" am: 96929d691e am: 2b83ca7481 am: 47b71b396b
am: 66b8b53018

Change-Id: Ic3b157f990dbe2a7a70ab46962d792a363a4d8c9
2017-10-19 02:40:03 +00:00
Bowgo Tsai 66b8b53018 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" am: 96929d691e am: 2b83ca7481
am: 47b71b396b

Change-Id: I9443752fb9cc751d655782cedf3c7c688500e1ee
2017-10-19 02:22:26 +00:00
SzuWei Lin c867f1b681 Add make_f2fs into GSI
The userdata partition of some devices is formatted in f2fs,
and could be formatted in runtime. This is a configurable
feature of AOSP, so GSI enables the setting:

    TARGET_USERIMAGES_USE_F2FS

to support it.

Bug: 67916560
Bug: 66925248
Test: build pass and check the make_f2fs in the image
Test: boot a pixel device with GSI to home screen
Change-Id: Id350c4e07a9c0dc0f0a547b3146626053c88b8ab
2017-10-19 02:07:35 +00:00
Bowgo Tsai 47b71b396b Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" am: 96929d691e
am: 2b83ca7481

Change-Id: I44d51b4632ddf19364b8eb1e636d13eb77d8adfc
2017-10-19 02:07:07 +00:00
Bowgo Tsai 2b83ca7481 Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk"
am: 96929d691e

Change-Id: I0a208412fe98cbd06b24bfba24f5f08edb95bb52
2017-10-19 01:56:00 +00:00
Treehugger Robot 96929d691e Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk" 2017-10-19 01:42:55 +00:00
Zach Riggle 6433fe1441 Merge "Add strace back onto userdebug builds" am: e02a37d046 am: 42ba61ca7c am: 7aaf1eec54
am: 953442280d

Change-Id: Iae0544a4788cef7e7fd221f98b8f4af9b04e9db2
2017-10-18 06:10:11 +00:00
Zach Riggle 953442280d Merge "Add strace back onto userdebug builds" am: e02a37d046 am: 42ba61ca7c
am: 7aaf1eec54

Change-Id: Ice5c9dd7fa2686c8ff8dc431b9d80ed5821418c8
2017-10-18 06:05:43 +00:00