Commit graph

58368 commits

Author SHA1 Message Date
Tobias Thierer
07f622b078 logtags: Support # line comments.
Allow # line comments to start anywhere in a line, not just in column 0.

Test: Added trailing # comments to SecurityLogTags.logtags and checked
      that 'make droid' still worked.
Test: Piped a few example lines through a small test script to verify
      that the following line behaved as expected:
      line = re.sub('#.*$', '', line)

Change-Id: Ib7904620adf8da7d11511ef6d8300e5fb4c73c29
2019-11-29 15:28:48 +00:00
markchien
ef83b80ec3 [Tether08] build InProcessTethering package
Build tethering package which is running the same process as system
server.
Since tethering still have some dependency with system server which
need to run in system server process(e.g. use LocalService), we
need to use InProcessTethering for all first. After cutting off
the dependency, Go devices would keep use "InProcessTethering" and
other non-Go devices would be switched to use "Tethering" package.

Bug: 136040414
Test: -build, flash, boot
Change-Id: I680273a3ee8fed3af843a829da17ca84b130f475
Merged-In: I680273a3ee8fed3af843a829da17ca84b130f475
2019-11-29 13:50:54 +00:00
markchien
1542743b88 [Tether08] build InProcessTethering package
Build tethering package which is running the same process as system
server.
Since tethering still have some dependency with system server which
need to run in system server process(e.g. use LocalService), we
need to use InProcessTethering for all first. After cutting off
the dependency, Go devices would keep use "InProcessTethering" and
other non-Go devices would be switched to use "Tethering" package.

Bug: 136040414
Test: -build, flash, boot
Change-Id: I680273a3ee8fed3af843a829da17ca84b130f475
2019-11-29 21:43:19 +08:00
Roshan Pius
626f6371dc base_system.mk: Align formatting for updatable boot jar variable
Migrate PRODUCT_UPDATABLE_BOOT_MODULES &
PRODUCT_UPDATABLE_BOOT_LOCATIONS to a new PRODUCT_UPDATABLE_BOOT_JARS.
This new variable uses the same format as
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS, i.e <apex>:<jar> pair.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1cb26d5ec825cd1f5282a6e0255094ddf2fe046a
2019-11-28 12:59:08 +00:00
SzuWei Lin
d24bc21f06 Remove ro.apex.updatable=false in GSI
Originally, GSI forced disable APEX and always contains apex
packages in flattern format. This patch remove the enforcement,
and APEX updateble is enabled according to ro.apex.updatable in
vendor.

Bug: 145245545
Test: build aosp_arm64-userdebug, check the property in system
Change-Id: I9cc943d7b2a30d037a2c1c137dad1233c1e3f57e
2019-11-28 12:57:05 +08:00
Daniel Norman
8821b9b2da Merge "Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts." am: e7c1f6314c am: df9403ab54
am: 5c74b51d65

Change-Id: I60ebdd3283ea73548b1b554c533525d22016a419
2019-11-27 12:47:03 -08:00
Daniel Norman
5c74b51d65 Merge "Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts." am: e7c1f6314c
am: df9403ab54

Change-Id: Ica5ddad94723cec1bcd9bb1856f699a282e55ecc
2019-11-27 12:44:04 -08:00
Daniel Norman
df9403ab54 Merge "Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts."
am: e7c1f6314c

Change-Id: Ie5f97b069c952e9dff4ee5f10480d10bb2319277
2019-11-27 12:41:02 -08:00
Treehugger Robot
e7c1f6314c Merge "Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts." 2019-11-27 20:30:34 +00:00
Kris Alder
f57ff1b385 Merge "rename 'make fuzz' to 'make haiku'" am: fe283c99e6 am: 6d1974bf9b
am: 58cea8106c

Change-Id: I11c39f0d4947edea1a5fbebed108396a1206f828
2019-11-27 10:15:56 -08:00
Kris Alder
58cea8106c Merge "rename 'make fuzz' to 'make haiku'" am: fe283c99e6
am: 6d1974bf9b

Change-Id: I43b93a7165b1a20c024fea862eb1b3fee96e85c6
2019-11-27 10:12:24 -08:00
Kris Alder
6d1974bf9b Merge "rename 'make fuzz' to 'make haiku'"
am: fe283c99e6

Change-Id: Id8a217d7f66ccebf3101b2e783866683247cb7bd
2019-11-27 10:10:25 -08:00
Kris Alder
fe283c99e6 Merge "rename 'make fuzz' to 'make haiku'" 2019-11-27 17:29:00 +00:00
Ulyana Trafimovich
c8ada00fea Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" am: 28ef4100ac am: 1dd62c175f
am: cf126dfb1a

Change-Id: I32dacb257960fcc048d0da3041d481af7dcb7c61
2019-11-27 06:14:42 -08:00
Ulyana Trafimovich
cf126dfb1a Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" am: 28ef4100ac
am: 1dd62c175f

Change-Id: Ib27ea4481e786d9de50fffafee9f80763826e9da
2019-11-27 06:11:36 -08:00
Ulyana Trafimovich
1dd62c175f Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules.""
am: 28ef4100ac

Change-Id: I70f7b32db9f495f7fcdcb98ddb671c3408d77aa4
2019-11-27 06:08:35 -08:00
Jooyung Han
fe15dd1eb7 Move extra VNDKs to /system_ext
Extra VNDKs are now installed under /system_ext in APEX format with
a phony target "vndk_apex_snapshot_package".

There are still files remained in /system/etc(*.libraries.<VER>.txt)
which are installed with "vndk_snapshot_packages".

These files are already packaged into VNDK APEXes, but linkerconfig and
libnativeloader still use them from /system/etc.(b/145184886)

Bug: 137802149
Test: lunch aosp_arm64
  && flash system.img on Q device
  && boot

Change-Id: I94c340d6f1c1af6ab1ae93c22b0a98fd4c10262e
2019-11-27 22:16:16 +09:00
Ulyana Trafimovich
28ef4100ac Merge "Revert^2 "Do not dexpreopt system server jars from updatable modules."" 2019-11-27 12:45:34 +00:00
Ulyana Trafimovich
213a7d86d5 Revert^2 "Do not dexpreopt system server jars from updatable modules."
This reverts commit fa7cf280ca.

Reason for revert: Build failure is not reproducible.
Forrest build on the same build ID 6033773 and same target
cf_x86_phone-userdebug_coverage finished successfully.

Change-Id: I188623237dfba657fb48966e0a34a975f13d00d2
2019-11-27 12:29:42 +00:00
Søren Gjesse
f38d3ccf47 Remove passing -forceprocessing flag to R8
R8 ignores the flag

Test: m -j
Change-Id: Id938aa35e87c9c69769a3184dfea06fd02299688
2019-11-27 12:41:45 +01:00
Dan Willemsen
18e7602a07 Merge "Clean include directory paths" am: f425c0964b am: 310a8ed1fa
am: bb333ab822

Change-Id: Ieaedb6a1c4f13024ae90a8ab4e5158ab1566d744
2019-11-26 15:45:31 -08:00
Dan Willemsen
bb333ab822 Merge "Clean include directory paths" am: f425c0964b
am: 310a8ed1fa

Change-Id: Id9f9f12003cfe530724e12704c7db6ce543a6902
2019-11-26 15:41:40 -08:00
Dan Willemsen
310a8ed1fa Merge "Clean include directory paths"
am: f425c0964b

Change-Id: I2b0be61215018036bf0416ba74ea5b4d9cdff715
2019-11-26 15:37:29 -08:00
Treehugger Robot
f425c0964b Merge "Clean include directory paths" 2019-11-26 23:30:42 +00:00
Sarah Chin
58a9596784 [automerger skipped] Merge "Set up IRadioConfig 1.3" am: bdb8b6cf20 am: dd02481cee
am: c147f40b77 -s ours
am skip reason: change_id Ia5ca23e07eda0d4db8a8c701181c073745abb094 with SHA1 97dc04f02a is in history

Change-Id: I7e131fcb37a92404c91ee40e0955802bd62e65ae
2019-11-26 12:09:54 -08:00
Sarah Chin
c147f40b77 Merge "Set up IRadioConfig 1.3" am: bdb8b6cf20
am: dd02481cee

Change-Id: Ibcd2011a6cc83e4b8a2eaeb390073fafd5653f0d
2019-11-26 12:06:54 -08:00
Kris Alder
8c8c2b96f2 rename 'make fuzz' to 'make haiku'
Bug: 145147479
Test: ran 'make haiku' locally, verified results match
Change-Id: I56b9bcfabe7dee705008e711d7c7d85421643e42
2019-11-26 12:03:39 -08:00
Sarah Chin
dd02481cee Merge "Set up IRadioConfig 1.3"
am: bdb8b6cf20

Change-Id: Ifc88deed93142ac0415b965ce0596ac9c02e773e
2019-11-26 12:03:36 -08:00
Roshan Pius
79ed0e6ae9 Merge changes from topic "wifi_mainline_apex"
* changes:
  base_system.mk: Switch to wifi mainline apex
  base_system.mk: Switch back to wifi-service.jar
2019-11-26 19:22:16 +00:00
Daniel Norman
55417148f9 Removes custom prefix/suffix from MergeDynamicPartitionInfoDicts.
All callers of this function now always pass the same values, so this
change hardcodes those values within the function body.

Fix: 145008064
Test: python -m unittest test_common
Test: build & boot a merged target that uses DAP

Change-Id: I0051c5ba507983231825edfcaf349e574efa451a
2019-11-26 11:09:17 -08:00
Sarah Chin
bdb8b6cf20 Merge "Set up IRadioConfig 1.3" 2019-11-26 18:52:26 +00:00
Roshan Pius
8086a123c3 base_system.mk: Switch to wifi mainline apex
Also, explicitly include the cacerts_wfa in builds. This used to be
included via the "required" tag in wifi-service build rule. We probably don't
want to deliver CA certificates to OEM devices via mainline updates. So,
leaving it out of the wifi mainline module & explicitly including it in
the base makefile.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I3e4487f9fad765e442bf8335ec1f21de3a47674d
2019-11-26 07:13:36 -08:00
Ulyana Trafimovich
50b04489d3 Merge "Revert "Do not dexpreopt system server jars from updatable modules."" am: b5dd40ed2b am: 44b94acf3e
am: 0678652fda

Change-Id: I764cb6a3b47f5fdf1765931955168658ad57d83e
2019-11-26 05:24:42 -08:00
Ulyana Trafimovich
0678652fda Merge "Revert "Do not dexpreopt system server jars from updatable modules."" am: b5dd40ed2b
am: 44b94acf3e

Change-Id: I3eba66d7ba56d89c51f0dcce99a2bd0acade2b57
2019-11-26 05:22:17 -08:00
Ulyana Trafimovich
44b94acf3e Merge "Revert "Do not dexpreopt system server jars from updatable modules.""
am: b5dd40ed2b

Change-Id: I5fd4dfae439ff8c658fa0a32d95abf6d52629c74
2019-11-26 05:19:59 -08:00
Ulyana Trafimovich
b5dd40ed2b Merge "Revert "Do not dexpreopt system server jars from updatable modules."" 2019-11-26 13:07:48 +00:00
Ulyana Trafimovich
fa7cf280ca Revert "Do not dexpreopt system server jars from updatable modules."
This reverts commit 3fb6a949a6.

Reason for revert: broken build git_master/cf_x86_phone-userdebug_coverage (likely caused by these changes).

Exempt-From-Owner-Approval: revert.

Change-Id: Ib72fe0395fd084e774d25ee783b7380395f9d9bd
2019-11-26 13:06:13 +00:00
Ulyana Trafimovich
d09648e6c0 Merge "Do not dexpreopt system server jars from updatable modules." am: 51833931af am: 6ff6d78fb5
am: a36b594f01

Change-Id: Ic1b5c1414b8fbf97199625d6d40cf716ad91d4b6
2019-11-26 02:31:25 -08:00
Ulyana Trafimovich
a36b594f01 Merge "Do not dexpreopt system server jars from updatable modules." am: 51833931af
am: 6ff6d78fb5

Change-Id: Ib14b408532b5cfb48d8fd28fe661881c80704851
2019-11-26 02:28:52 -08:00
Ulyana Trafimovich
6ff6d78fb5 Merge "Do not dexpreopt system server jars from updatable modules."
am: 51833931af

Change-Id: Ia4ccc35c1b281a1c2732d963dbe29ec454367cfe
2019-11-26 02:26:32 -08:00
Ulyana Trafimovich
51833931af Merge "Do not dexpreopt system server jars from updatable modules." 2019-11-26 10:18:02 +00:00
Roshan Pius
2cea7f9417 base_system.mk: Switch back to wifi-service.jar
Reason for revert: Wifi services no longer plan to be a separate
APK/process for mainline. Will instead become a jar loaded from Apex.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I80dd27aae3bb8de372c210d6d16adfcdd9458017
2019-11-25 20:56:54 -08:00
Dan Willemsen
c9a657c907 Clean include directory paths
To remove '../' and other strangeness from compiler arguments, which run
into problems with remote execution:

  Android.mk: LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/bar/..
  foo.c: #include "foo.h"
  include/foo.h

In this case, we'll send foo.c and include/foo.h, but include/bar may be
empty, and not exist on the remote server. So while the file is there,
you may not be able to access it.

There's also a byproduct of removing extra '/' and './' components,
which should be harmless.

Fixes: 144109314
Test: diff build-aosp_arm.ninja before/after; scan diffs
Test: treehugger
Change-Id: Id2eceba76fbf9b1524487e82cb5c8903c815e45f
2019-11-25 20:39:22 -08:00
Robert Shih
3c4aa69885 gsi current.txt: add android.hardware.drm@1.3.so
Bug: 139134043
Test: build
Change-Id: Ifc37b7af4712fc768ed17b4af115868379a54039
2019-11-26 01:54:52 +00:00
Yifan Hong
190b955f87 Merge "Move check partition size logs to a file" am: 874a5aa95e am: 7b3a7105e5
am: 2df96d7bba

Change-Id: Icf5a81a59af7e68d6e4a5d6c749d4790f403f6fa
2019-11-25 16:52:08 -08:00
Yifan Hong
2df96d7bba Merge "Move check partition size logs to a file" am: 874a5aa95e
am: 7b3a7105e5

Change-Id: Ia7af36b4b4e6edb1fb27780fd908d48d564c69b4
2019-11-25 16:49:37 -08:00
Yifan Hong
7b3a7105e5 Merge "Move check partition size logs to a file"
am: 874a5aa95e

Change-Id: If2c6e251773f9ffe353abf3da02a07b57ee169eb
2019-11-25 16:47:04 -08:00
Yifan Hong
874a5aa95e Merge "Move check partition size logs to a file" 2019-11-26 00:32:52 +00:00
Sarah Chin
86167418b7 Set up IRadioConfig 1.3
Test: build
Bug: 144101226
Change-Id: Ia5ca23e07eda0d4db8a8c701181c073745abb094
Merged-In: Ia5ca23e07eda0d4db8a8c701181c073745abb094
2019-11-25 16:26:18 -08:00
Sarah Chin
7e04417beb Merge "Set up IRadioConfig 1.3" 2019-11-25 23:58:49 +00:00