Commit Graph

46730 Commits

Author SHA1 Message Date
Anton Hansson
a38f6aac3a Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system"
am: 058f33ec0f

Change-Id: Ie9ca08191c1b3b75aef94aad1a7a1458a5f3dd67
2018-10-18 09:05:59 -07:00
Anton Hansson
058f33ec0f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system" 2018-10-18 15:32:47 +00:00
Anton Hansson
b65a5ba193 Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
2018-10-18 13:40:22 +01:00
Anton Hansson
c15e717584 Merge "Add PresencePolling to mainline_system"
am: fc1e1a54cd

Change-Id: If92e8d9c57598c91b720fe71e9c6134deaa6e8d9
2018-10-18 02:04:16 -07:00
Anton Hansson
e7334299df Merge "Re-submit "Add trailing slash to mainline path claims.""
am: 471a45b952

Change-Id: I99cb86a27887df6d2bf0cb922621c7c52e35aa39
2018-10-18 01:52:34 -07:00
Anton Hansson
fc1e1a54cd Merge "Add PresencePolling to mainline_system" 2018-10-18 08:04:19 +00:00
Anton Hansson
471a45b952 Merge "Re-submit "Add trailing slash to mainline path claims."" 2018-10-18 08:03:53 +00:00
bohu
ef14e322c2 Merge "fix generic_x86_arm"
am: 569ddd300b

Change-Id: I66338017c69b4ecfad9c630b1f9cbc6c45041d86
2018-10-18 00:27:28 -07:00
Treehugger Robot
569ddd300b Merge "fix generic_x86_arm" 2018-10-18 06:59:39 +00:00
Dan Willemsen
dfb64ca033 Merge "Remove check_emu_boot, it's no longer necessary"
am: 6393560856

Change-Id: I89e3fc589dd2840fdea28b98f0de400d51a2a95a
2018-10-17 17:20:50 -07:00
Treehugger Robot
6393560856 Merge "Remove check_emu_boot, it's no longer necessary" 2018-10-17 23:22:47 +00:00
bohu
9b4e805a4d fix generic_x86_arm
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.

BUG: 117673798

Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
2018-10-17 21:57:15 +00:00
Dan Willemsen
b1e3357962 Remove check_emu_boot, it's no longer necessary
Bug: 117859878
Test: treehugger
Change-Id: I4e9ade9b5b9dc7d494101bbd0b0eb2b245244337
2018-10-17 11:13:07 -07:00
Anton Hansson
f452c3528d Merge "Fix typo"
am: fac7b1de9c

Change-Id: Ia4b33f3d51aa32d49ff29b387eabaabb2defa085
2018-10-17 10:53:32 -07:00
Dan Willemsen
c466bc0203 Merge "Clean up DIST_DIR usages, move to dist-for-goals"
am: d3e8e5321f

Change-Id: Ib9defade594f2ccfe21aa2e6dc01e1641d12d9af
2018-10-17 10:38:52 -07:00
Patrik Fimml
c86ebb6086 Merge "Don't override zsh users' compinit options."
am: bcd3d85971

Change-Id: I0efc6626744d3689ced3edb43f20d1fc586e7e92
2018-10-17 10:38:11 -07:00
Mathew Inwood
964070be62 Merge "Write greylist annotation metadata to a csv file."
am: c948d1a101

Change-Id: Iec3c09d23ab8b5f3a925e778f1a8c89f36ce563c
2018-10-17 10:28:31 -07:00
Anton Hansson
da02e8619a Add PresencePolling to mainline_system
Missed adding this app in I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b.
It is usually added in conjunction with RcsService.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic721d1dcef479a03f4b603bd77a91801ea9dd9ec
2018-10-17 18:04:46 +01:00
Treehugger Robot
fac7b1de9c Merge "Fix typo" 2018-10-17 16:17:21 +00:00
Anton Hansson
dcb5ef1333 Re-submit "Add trailing slash to mainline path claims."
With a workaround for preopt files that get installed into an unknown
path. The BoardConfig defines whether the files go in /system_other,
so allow that.

This reverts commit 46bf4b510c.

Test: lunch mainline_arm64-userdebug; m nothing
Change-Id: Ia75670eb6e3730ad0ff17f5b81954b69f6cab22b
2018-10-17 16:40:29 +01:00
Treehugger Robot
d3e8e5321f Merge "Clean up DIST_DIR usages, move to dist-for-goals" 2018-10-17 15:26:38 +00:00
Patrik Fimml
bcd3d85971 Merge "Don't override zsh users' compinit options." 2018-10-17 10:53:33 +00:00
Mathew Inwood
c948d1a101 Merge "Write greylist annotation metadata to a csv file." 2018-10-17 09:20:04 +00:00
Anton Hansson
28e0f0353c Fix typo
We want to add to PRODUCT_PACKAGES_DEBUG, not overwrite it.

Test: make
Change-Id: Ib67d20e33b30edd76ca24ce208f899cb4c25004c
2018-10-17 09:08:27 +01:00
Anton Hansson
e885f35d05 Merge "Add some debug binaries to mainline_system"
am: 7f758720f6

Change-Id: I251cae723eb7efec8823f1501a3d2e2bd075b94a
2018-10-17 00:40:19 -07:00
Anton Hansson
daae95e8ff Merge "Allow a hint together with artifact path enforcement"
am: 4fa4ba11ef

Change-Id: I7effaeb2a9b70e9c79f465a68ab7d7a6aa1757ce
2018-10-17 00:39:41 -07:00
Anton Hansson
8bafde098f Merge "Add the default charger images to mainline_system"
am: bb449e0bd4

Change-Id: I404000cdf8ecc31a9239bc9ebf0df6763382584f
2018-10-17 00:38:59 -07:00
Anton Hansson
7f758720f6 Merge "Add some debug binaries to mainline_system" 2018-10-17 07:23:18 +00:00
Anton Hansson
4fa4ba11ef Merge "Allow a hint together with artifact path enforcement" 2018-10-17 07:22:55 +00:00
Anton Hansson
bb449e0bd4 Merge "Add the default charger images to mainline_system" 2018-10-17 07:20:54 +00:00
Dan Willemsen
7537fd050f Clean up DIST_DIR usages, move to dist-for-goals
soong_ui now guarantees DIST_DIR is set in the environment, so remove
the default.

Use dist-for-goals instead of writing directly into DIST_DIR.

When building the system image, use DIST_DIR from the environment
instead of from make. This will eventually stop working, but this will
work for now.

Bug: 117463001
Test: m dist  (check gpl_source.tgz, logs/product_copy_files_ignored.txt)
Test: m out/target/product/generic/product_copy_files_ignored.txt
Change-Id: Ice557e0a148602cb8eb154efb747d416f0d0db59
2018-10-16 23:37:51 -07:00
Jiyong Park
9018cbb5bf Merge "android.test.{base|mock} are added as optional libraries."
am: 6587e4566f

Change-Id: Ib274975e54426041d5c0d2ee76125e8d640f094d
2018-10-16 21:44:07 -07:00
Treehugger Robot
6587e4566f Merge "android.test.{base|mock} are added as optional libraries." 2018-10-17 04:29:07 +00:00
Yifan Hong
3c135d09ab Merge "Build group info to super image"
am: 206813151d

Change-Id: I09ca9a4a508c54455d2be1d97d52aceddce14204
2018-10-16 18:48:41 -07:00
Treehugger Robot
206813151d Merge "Build group info to super image" 2018-10-17 01:37:24 +00:00
Jiyong Park
4a602955d0 android.test.{base|mock} are added as optional libraries.
The two java shared libraries do not exist in the pre-P devices.
Therefore, marking the dependencies to the libraries as optional so that
an app is still installable to the old devices.

This is safe because the classes in the java shared libs exist in other
shared libraries (bootclasspath or android.test.runner).

Bug: 113800422
Test: run aapt dump badging on the built GtsBackupHostTestCases

uses-library tags for android.test.base|mock are with
android:required=false, while the same tag for other libs are without
the attribute.

Change-Id: Ieb7c1429077aaf6899e214a217d9455d95dbfea6
2018-10-17 10:21:33 +09:00
Yifan Hong
dcf4762364 Merge "Remove PRODUCT_USE_FASTBOOTD flag."
am: d5eb793c40

Change-Id: I59338496d3ddbefa2ed3df2056595bbc37572ce6
2018-10-16 16:48:29 -07:00
Treehugger Robot
d5eb793c40 Merge "Remove PRODUCT_USE_FASTBOOTD flag." 2018-10-16 23:43:09 +00:00
Chih-Hung Hsieh
6cae701e1e Merge "Fix implicit-fallthrough warning."
am: 160bbc42f8

Change-Id: I9eccfbdc8fc93501c18a07b3de81288a243f50db
2018-10-16 15:17:24 -07:00
David Anderson
11d4c35bfb Merge "Rename vbmeta_mainline to vbmeta_system."
am: 86fb70dcdc

Change-Id: Id0abc01c96841681ae8a302a011614f134d22a77
2018-10-16 15:16:06 -07:00
Treehugger Robot
160bbc42f8 Merge "Fix implicit-fallthrough warning." 2018-10-16 22:04:01 +00:00
Treehugger Robot
86fb70dcdc Merge "Rename vbmeta_mainline to vbmeta_system." 2018-10-16 22:02:48 +00:00
Yifan Hong
9edaa38bdf Build group info to super image
Bug: 116817738
Test: lpdump and manual inspect
Change-Id: I990300d1d5772ae5e9f28b916d91c5bea9cd9a50
2018-10-16 14:32:43 -07:00
Tom Cherry
aafccd7aac Merge "Separate init packaging for mainline"
am: eea8dad05f

Change-Id: I9ddf2c1357793e28e81cf06d31abaa58acf798f6
2018-10-16 13:38:36 -07:00
Yifan Hong
422790ca3d Remove PRODUCT_USE_FASTBOOTD flag.
It is not used.
Test: builds

Change-Id: Iff5fbae524945cebd9c8911762e7fc7fb8ac19aa
2018-10-16 13:34:18 -07:00
Tom Cherry
eea8dad05f Merge "Separate init packaging for mainline" 2018-10-16 20:29:47 +00:00
Chih-Hung Hsieh
1ce134aab7 Fix implicit-fallthrough warning.
Bug: 112564944
Test: make checkbuild
Change-Id: I7fcc52cd96cd781fe026e07c8029feeea8ceced0
2018-10-16 11:50:18 -07:00
Tom Cherry
6195b3578a Separate init packaging for mainline
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system.  This change references two phony
packages that include the right parts of init for systen and vendor.

Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
2018-10-16 09:58:54 -07:00
Anton Hansson
aa236882c0 Add the default charger images to mainline_system
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I539b57ef436be3d6209d6436fae6c5eb75832bf7
2018-10-16 17:34:33 +01:00
Anton Hansson
36c5d0d1cc Add some debug binaries to mainline_system
These binaries are commonly included in debug builds, so include
them on mainline too.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: If0adfb4795ea82e158a0218d9c16d897012dd8b5
2018-10-16 16:15:39 +01:00