Commit graph

44444 commits

Author SHA1 Message Date
Jiyong Park
ba9c287e52 [automerger skipped] Remove some VNDK libraries that were incorrectly added
am: aa43c4b7d3  -s ours

Change-Id: Ia8f1cf94a34ef7069e29d6546dd18c043c183355
2018-05-07 14:29:25 -07:00
android-build-team Robot
1ccf2c3563 Merge "Add vr_hwc to GSI" into pi-dev
am: d819512eee

Change-Id: Iff5f9850c31ed03172452713eaea12eea2d56b8c
2018-05-07 13:44:16 -07:00
android-build-team Robot
d819512eee Merge "Add vr_hwc to GSI" into pi-dev 2018-05-07 20:34:05 +00:00
Colin Cross
f0e93a6cfc [automerger skipped] Merge changes from topic "soong_support_libs" am: 9871635469
am: c692e6e9f3  -s ours

Change-Id: I39d1118cc11aadb8c53daaef9a046847f968791f
2018-05-07 13:18:42 -07:00
Colin Cross
c692e6e9f3 Merge changes from topic "soong_support_libs"
am: 9871635469

Change-Id: Id57650ed5b856a6887043ebc4cae264d12720127
2018-05-07 12:09:23 -07:00
Colin Cross
9871635469 Merge changes from topic "soong_support_libs"
* changes:
  Fix support libraries dependencies based on Soong modules
  Always statically include Support Libraries, move SDK definitions up a dir
  Move Support Library dependencies to their own var with resolution
  Allow projects to define their own globally-available variables
2018-05-07 17:53:09 +00:00
Mathieu Chartier
90d229d096 Specify speed compiler filter for image
am: c0890b9386

Change-Id: I7f0caf153d7cac897a282441420cb73e9daa3035
2018-05-07 10:17:30 -07:00
SzuWei Lin
ece9324bed Add vr_hwc to GSI
Bug: 78308559
Test: Check the /system/etc/init/vr_hwc.rc and /system/bin/vr_hwc
      are built into system.img

Change-Id: I84ac8149d1bccaff0451f4a4ae679853d6625976
2018-05-07 13:44:30 +08:00
android-build-prod (mdb)
78c516077c Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" am: ab235a9fb8
am: 954d6b2075

Change-Id: I5a478d2d9e37bb60e76394ed7be8317da009049c
2018-05-05 14:44:21 -07:00
android-build-prod (mdb)
954d6b2075 Merge "Add iotop to PRODUCT_PACKAGES_DEBUG"
am: ab235a9fb8

Change-Id: I4f891d2bcba9964dd11fe036d3143a660a960d56
2018-05-05 14:38:07 -07:00
android-build-prod (mdb)
ab235a9fb8 Merge "Add iotop to PRODUCT_PACKAGES_DEBUG" 2018-05-05 21:31:07 +00:00
Jiyong Park
aa43c4b7d3 Remove some VNDK libraries that were incorrectly added
Following libs for VR were added due to the dependency from libgui.
Since the dependency is cut for vendor variant of libgui, they don't
need to be in VNDK consuming storage.

- libbufferhub
- libbufferhubqueue
- libpdx_default_transport

Bug: 77155589
Test: m -j

Merged-In: I9e6392464b3c936323c01b19d97d65635804a104
Change-Id: I9e6392464b3c936323c01b19d97d65635804a104
(cherry picked from commit 82241b83fc)
(cherry picked from commit d4577e762f)
2018-05-04 19:11:17 -07:00
Dan Willemsen
aeaf4c2407 Add iotop to PRODUCT_PACKAGES_DEBUG
This was previously marked as LOCAL_MODULE_TAGS := debug, and is used
from dumpstate.

Test: iotop is still installed after remove the debug tag
Change-Id: I685456f52403a2d5c6fbbff1429c6af422ce26df
2018-05-04 18:53:34 -07:00
android-build-prod (mdb)
88a1208056 Merge "Stop being noisy about including the bash completions." am: f49d12ca24
am: 04dc7c97d3

Change-Id: Ie8972870d6c9be28db85959e6607eb1b2f53d4ec
2018-05-04 17:04:01 -07:00
android-build-prod (mdb)
04dc7c97d3 Merge "Stop being noisy about including the bash completions."
am: f49d12ca24

Change-Id: I2b931e302373545dc4a913067d6773143dd4cc11
2018-05-04 16:55:54 -07:00
Calin Juravle
dfbf63db59 Create a common product config for boot image profiling
am: 053a04f68e

Change-Id: I36010fd4a96450ab1660cd60bbc88eaf5defd3d0
2018-05-04 16:16:07 -07:00
android-build-prod (mdb)
f49d12ca24 Merge "Stop being noisy about including the bash completions." 2018-05-04 23:06:52 +00:00
Mathieu Chartier
c0890b9386 Specify speed compiler filter for image
To get better performance, specify speed compiler filter. This will
enable system server to run with a compiled boot image

Bug: 73313191
Test: make and flash sailfish
Change-Id: Ic41870c53620b9ae4cc48fc560740f8c7e09e5b2
2018-05-04 23:04:51 +00:00
Calin Juravle
053a04f68e Create a common product config for boot image profiling
Test: manual
Bug: 73313191
Change-Id: Ia25e9dc84509be110feabfbd6d7596087d1e441d
2018-05-04 14:41:48 -07:00
Zhomart Mukhamejanov
29edf01060 Merge "releasetools: Make _GetPropertyFilesString public" am: f6806a7ff3
am: f537477022

Change-Id: I4c243f04baaceab6fc0750533a4d1c18c2531efb
2018-05-04 14:35:19 -07:00
Zhomart Mukhamejanov
f537477022 Merge "releasetools: Make _GetPropertyFilesString public"
am: f6806a7ff3

Change-Id: I4dfd8d7c40bac1138b636d936da9bbea3be18a3f
2018-05-04 14:30:44 -07:00
Zhomart Mukhamejanov
f6806a7ff3 Merge "releasetools: Make _GetPropertyFilesString public" 2018-05-04 21:17:54 +00:00
Elliott Hughes
2f9152618f Stop being noisy about including the bash completions.
Now most of the other noise is gone, we should probably quiet down too.

Bug: N/A
Test: `source build/envsetup.sh`
Change-Id: Ic5b169b1771163488e70d732276372efbf304bae
2018-05-04 13:21:16 -07:00
Zhomart Mukhamejanov
603655f5b5 releasetools: Make _GetPropertyFilesString public
ota_from_target_files.py:

Rename PropertyFiles._GetPropertyFilesString to
PropertyFiles.GetPropertyFilesString.

Currently only PropertyFiles.Compute and
PropertyFiles.Finalize gives access to _GetPropertyFilesString.
But Compute force sets reserve_space=True,
and Finalize requires reserved_length.

_GetPropertyFilesString is useful method that can
be used outside releasetools.

One of the usage is in bootable/recovery/updater_sample/.

Test: python -m unittest test_ota_from_target_files
Change-Id: I2cc44ec46a0e68ba071531b003af8cdbfe90e588
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-04 12:35:09 -07:00
android-build-prod (mdb)
4f0aabfb52 Merge "Remove settitle" am: 5b36fb759b
am: c4f7d50fd0

Change-Id: Ia46c001cc944116b08cff80731ed6ea26edf14d6
2018-05-04 10:18:17 -07:00
android-build-prod (mdb)
c4f7d50fd0 Merge "Remove settitle"
am: 5b36fb759b

Change-Id: I4c357d16cb789a87db03c8f41b9c32dde4a5e984
2018-05-04 10:12:40 -07:00
android-build-prod (mdb)
5b36fb759b Merge "Remove settitle" 2018-05-04 17:00:10 +00:00
Ng Zhi An
cd2b3869f8 Remove settitle
settitle always had a bug in the PROMPT_COMMAND, it used "\033]0;",
where it should be "\033[0m". It was opt-in, and changed to opt-out, and
no one really complained that it didn't work. So we are just going to
remove this.

References:
- http://www.termsys.demon.co.uk/vtansi.htm
- https://en.wikipedia.org/wiki/ANSI_escape_code

Test: lunch and see no change in prompt
Change-Id: I777c87b4d8e80c0e9437e5d2628f6df020883389
2018-05-04 08:21:22 -07:00
android-build-team Robot
47c3be39a6 [automerger skipped] Merge "Fix support libraries dependencies based on Soong modules" into pi-dev
am: 5739f2b53b  -s ours

Change-Id: I301b1d8933754b9ed86e0d3aaaa80dc1d370908e
2018-05-03 18:03:53 -07:00
android-build-team Robot
5739f2b53b Merge "Fix support libraries dependencies based on Soong modules" into pi-dev 2018-05-04 00:55:40 +00:00
android-build-team Robot
1680c0af1d Merge "PLATFORM_PREVIEW_SDK_VERSION should be 0" into pi-dev
am: 9665c10777

Change-Id: I007049bc00bead700734b90ae831fb2b7aa728cc
2018-05-03 17:31:29 -07:00
android-build-team Robot
9665c10777 Merge "PLATFORM_PREVIEW_SDK_VERSION should be 0" into pi-dev 2018-05-04 00:12:35 +00:00
Colin Cross
8560930893 Fix support libraries dependencies based on Soong modules
Use a list of support library java and android libraries exported
from Soong to rewrite dependencies into the appropriate
LOCAL_STATIC_JAVA_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 78300023
Test: m checkbuild
Change-Id: I4fd1e563272fcef9238a46cda840210529bd706a
Merged-In: I4fd1e563272fcef9238a46cda840210529bd706a
(cherry picked from commit ceadbadc5d)
2018-05-03 16:47:55 -07:00
Alan Viverette
7b7cdb7777 Always statically include Support Libraries, move SDK definitions up a dir
Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
Merged-In: Id7198997ac5cacf76fd8ab155a60026d65e420ec
(cherry picked from commit 1efaf37cb7)
2018-05-03 16:47:11 -07:00
Alan Viverette
fb8f5baae4 Move Support Library dependencies to their own var with resolution
Bug: 73250914
Test: make checkbuild
Change-Id: Ibdbe2fd140133202b266ca4f233c4d42292fa3df
Merged-In: Ibdbe2fd140133202b266ca4f233c4d42292fa3df
(cherry picked from commit 53f6b2a80b)
2018-05-03 16:47:11 -07:00
Alan Viverette
8ead03bde1 Allow projects to define their own globally-available variables
Bug: 73178261
Test: make checkbuild
Change-Id: I53ee0f1d3ec072e19f4893cca44e16ef672fabfe
Merged-In: I53ee0f1d3ec072e19f4893cca44e16ef672fabfe
(cherry picked from commit fa0184fae9)
2018-05-03 16:47:11 -07:00
android-build-team Robot
c92b6796ce Merge "Disable privapp_permissions checking in GSI temporarily" into pi-dev
am: 76354382d1

Change-Id: Ib2e1f092721c486b4660487e1302a7d9012525c0
2018-05-03 16:17:08 -07:00
Colin Cross
aee6e3b59e Merge "Fix support libraries dependencies based on Soong modules" into pi-dev-plus-aosp 2018-05-03 23:14:23 +00:00
android-build-team Robot
76354382d1 Merge "Disable privapp_permissions checking in GSI temporarily" into pi-dev 2018-05-03 23:00:11 +00:00
Fang Deng
fb556b019c Merge "[Harness Separation] Move cts-tradefed to a new dir (cts.mk)" into pi-dev
am: 428d477bf1

Change-Id: Ieecd6a0899e706155c506ef2fae05f700cde65b9
2018-05-03 15:53:20 -07:00
Colin Cross
c9c5dc89cd Fix support libraries dependencies based on Soong modules
Use a list of support library java and android libraries exported
from Soong to rewrite dependencies into the appropriate
LOCAL_STATIC_JAVA_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 78300023
Test: m checkbuild
Change-Id: I4fd1e563272fcef9238a46cda840210529bd706a
Merged-In: I4fd1e563272fcef9238a46cda840210529bd706a
(cherry picked from commit ceadbadc5d)
2018-05-03 15:47:41 -07:00
Fang Deng
428d477bf1 Merge "[Harness Separation] Move cts-tradefed to a new dir (cts.mk)" into pi-dev 2018-05-03 22:39:46 +00:00
Colin Cross
faa2f90c83 Fix support libraries dependencies based on Soong modules
Use a list of support library java and android libraries exported
from Soong to rewrite dependencies into the appropriate
LOCAL_STATIC_JAVA_LIBRARIES and LOCAL_STATIC_ANDROID_LIBRARIES.

Bug: 78300023
Test: m checkbuild
Change-Id: I4fd1e563272fcef9238a46cda840210529bd706a
Merged-In: I4fd1e563272fcef9238a46cda840210529bd706a
(cherry picked from commit ceadbadc5d)
2018-05-03 22:28:17 +00:00
Ian Pedowitz
23898eed9d PLATFORM_PREVIEW_SDK_VERSION should be 0
It is already set to 0 because of REL, but explicitly set it

Bug: 77589980
Test: N/A
Change-Id: I97839c7dc09f8313f767635469f27b2a0d0e5010
2018-05-03 15:27:27 -07:00
Colin Cross
5084350cff [automerger skipped] Merge changes from topic "soong_support_lib_pi_dev_prereqs" into pi-dev
am: 2a5370179a  -s ours

Change-Id: I55a4ae1d60b7bd5f8a7e2e05df1fada7e3811a90
2018-05-03 15:00:24 -07:00
Colin Cross
2a5370179a Merge changes from topic "soong_support_lib_pi_dev_prereqs" into pi-dev
* changes:
  Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES
  Allow Soong to export multiple proguard flags files
  Fix echo when copying package-res.apk
  Allow soong java libraries to include exported resources and proguard flags
2018-05-03 21:47:25 +00:00
Fang Deng
8ebc942152 [Harness Separation] Move cts-tradefed to a new dir (cts.mk)
Move cts-tradefed to a new dir.
Fix cts.mk to point to the new dir.
Bug: 78461075
Bug: 79201478
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter CtsGestureTestCases
Test: cts/harness/tools/cts-tradefed/tests/run_tests.sh
Test: make gts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64

Change-Id: I8b610bf2f0b84baa7e8a30759f7d53d1b2a5d8f1
2018-05-03 10:53:37 -07:00
Anton Hansson
272035c19c Merge "Move apicheck.mk off SRC_API_DIR." am: a1dc661f71
am: 02cae4c505

Change-Id: I93bcd3521b72eb932d3aeed2a5a5dc4d1a9bc35e
2018-05-03 06:31:48 -07:00
Anton Hansson
02cae4c505 Merge "Move apicheck.mk off SRC_API_DIR."
am: a1dc661f71

Change-Id: Ibc9d94ac9aed3b679d73da0aaad9ffe036b0a43d
2018-05-03 06:27:13 -07:00
Anton Hansson
a1dc661f71 Merge "Move apicheck.mk off SRC_API_DIR." 2018-05-03 13:18:25 +00:00