Commit graph

42 commits

Author SHA1 Message Date
Roshan Pius
dfbf38599c Revert "Revert "product: Remove wifi-service off SystemServerCla..." am: 48825727f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12282976

Change-Id: Icf14b0d6862a0572f67a547faf1760a2d891a439
2020-08-04 00:45:39 +00:00
Roshan Pius
48825727f6 Revert "Revert "product: Remove wifi-service off SystemServerCla..."
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...

Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: build
Change-Id: Ia40bc9dec81347e205e5ff81d7b9045655fbe13a
2020-08-03 17:27:21 +00:00
Jiyong Park
7b933fb576 Some properties are set as optional
Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
(cherry picked from commit dfb3937ce4)
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
2020-06-30 14:28:16 +09:00
Jiyong Park
1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09:00
Dmitri Plotnikov
b99d94f9b2 Remove service-jobscheduler and service-blobstore from SERVICECLASSPATH
Test: atest android.jobscheduler.cts
Bug: 155631167
Change-Id: I5873c15513cfc63771e7d5c73791708105dff002
2020-05-05 13:28:34 -07:00
Roshan Pius
fa756a8b1f media_system.mk: Rename wifi-service to service-wifi
Bug: 145195135
Test: Device boots up and connects to wifi networks.
Change-Id: I8ce4f53fc2bc0194040fd0fd7d50eeefbdde7192
2020-03-23 10:02:15 -07:00
Ulya Trafimovich
db088602f5 Put com.android.location.provider before services on the system server classpath.
Test: aosp_walleye-userdebug boots and there are no messages in the
  logcat regarding class loader context mismatch:

    $ adb logcat | grep 'mismatch'
    # empty

Bug: 147017252
Change-Id: I338685b9cf71681b5ca0c541752948934b656b46
2020-03-19 18:06:23 +00:00
Jooyung Han
f5e53004cd Remove vnd*.libraries.txt from /system/etc
These files are moved to VNDK APEX.

Bug: 145184886
Test: bulid && boot
Merged-In: I85ab025e1ad490ee7704e4219c5ee611c83ca429
Change-Id: I85ab025e1ad490ee7704e4219c5ee611c83ca429
(cherry picked from commit 93cb9b5b31)
2020-03-08 13:11:24 +09:00
Alexander Dorokhine
75c5773187 DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I98774c8e8686b6d8fcb058ab0f1d5d4ecfa314cb
2020-02-25 17:24:36 -08:00
evitayan
1173332eb2 Load ike in system server classpath instead of bootclasspath
Module IPsec(IKE) will be built as a java_sdk_library and will not
be in bootclasspath anymore. It will be loaded in system sevrer
classpath so that it can be used by VPN.

Bug: 145995723
Test: build, flash, boot
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Test: manually tested that it is loaded in system server
Change-Id: I3126605613202b1e981b4e7f594acb6edbb7d635
2020-02-13 17:24:19 -08:00
Sravan Kumar Reddy Kallu
0457d2f719 Revert "product: Remove wifi-service off SystemServerClassPath"
Revert submission 10103769-load_wifi_service_dynamically

Exempt-From-Owner-Approval: see go/perf-revert-first

Reason for revert: <Regression reported in b/148099857>

Reverted Changes:
I7b658cbfa: SystemServer: Dynamically load wifi-service
I93f2467d0: product: Remove wifi-service off SystemServerClass...

Change-Id: I83a2f93e351675eecc1e15ea1bfd9e1407e3f7cb
2020-01-21 22:31:00 +00:00
Roshan Pius
bfa41eef33 product: Remove wifi-service off SystemServerClassPath
We can dynamically load it instead.

Bug: 147799672
Test: Device boots up & connects to wifi networks.
Change-Id: I93f2467d0a39719157dac92fd8ba108bb2bde470
2020-01-16 06:31:08 -08:00
Hai Zhang
463a093e5c Allow adding framework and service java code into permission APEX.
Bug: 136503238
Test: presubmit
Change-Id: Idef2216deae08c6e82f8f166a39cf179461f2668
2020-01-15 09:37:58 -08:00
Tej Singh
300158adc2 Remove service-statsd off SystemServerClassPath
We can dynamically load it instead.

Test: boots
Bug: 146064616
Change-Id: Ifbd039e83d92e8c757427f7aebb8ed8af2151f93
2020-01-08 18:51:04 -08:00
Alexander Dorokhine
a8bae14fce Add framework-appsearch apex on the classpath.
Test: presubmit
Bug: 146218515
Change-Id: If511234a958661e71fcfb50c28679f6ff91f3ad8
2019-12-17 10:44:27 -08:00
Tej Singh
e9403e4e79 Move service-statsd to updatable system server jar
This moves StatsCompanionService into the statsd apex.
service-statsd.jar is no longer installed to system/framework, and is
instead installed to
/apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from
PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 145923413
Test: make clean; make; vendor/google/tools/flashall and manual
inspection of jar locations
Test: made trivial update to SCS and bumped the version of the apex.
Then did: 1. make com.android.os.statsd 2. adb install
com.android.os.statsd 3. adb reboot. Verified that the change was
reflected via the apex update

Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e
2019-12-12 15:23:59 -08: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
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
Anton Hansson
c5ece221b2 Merge "Update references to service jars" 2019-11-25 13:15:57 +00:00
Roshan Pius
27367f05c2 Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619 am: 20cc65daed
am: b318e9931e

Change-Id: I6d005b66cfcae711d12a8facc95ccbcba9c81e6f
2019-11-22 19:21:07 -08:00
Roshan Pius
d6e239fc35 base_system.mk: Support system_server jars from apexes
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib. Also, not all the
libraries in /apex/<module_name>/javalib will be a system_server jar,
so adding a mechanism to list out the jar file explicitly within the
apex module.

Bug: 144722612
Bug: 141785760
Test: Compiles (both with empty & non-empty PRODUCT_SYSTEM_SERVER_APEX_JARS
value set)

Change-Id: Ia181ab22fdf2da575bfd532c1cd90a2f54742528
2019-11-22 12:48:09 -08:00
Anton Hansson
a2b816616c Update references to service jars
These are being renamed to service-* instead of *-service.

Test: treehugger
Change-Id: Ib8af8ca8eafee7d466d2d3873461bbd9c91a686d
2019-11-22 12:15:32 +00:00
Terry Wang
05f2c27dec Add a new system service for app search management.
This change adds appsearch-service to base system and media system.

Bug: 142567528
Test: atest cts/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
Change-Id: I4c7b2a2fb7e58b6796a4e5f2034f70d0dc706e0f
2019-11-19 10:42:46 -08:00
Sudheer Shanka
24876a7dc2 Add a new system service for blob store management.
This change adds a bare-bones system service, implementation will follow
later.

Bug: 143559646
Test: atest cts/tests/BlobStore/src/com/android/cts/blob/BlobStoreManagerTest.java
Change-Id: I344cc516d364c5148be3b4994d630fad5f73cf27
2019-10-29 15:22:45 -07:00
Tej Singh
452ff03fb9 Add statsd-service to system server jars
Add statsd-service to system server jars so that StatsCompanionService
continues to exist in system server.

Bug: 141697533
Test: builds and boots: 1. make clean 2. m -j droid 3.
vendor/google/tools/flashall
Change-Id: Ie26e3ac23c407364f5ab6796ee2c65023c87360e
2019-09-27 16:51:46 -07:00
Roshan Pius
cb448dc431 Merge "product: Mainline wifi module" 2019-08-14 19:33:10 +00:00
Roshan Pius
804ca70cb7 product: Mainline wifi module
Move wifi services into a separate APK.

For now, the wifi stack will run inside system_server for all devices.

In the future, when the wifi stack becomes a mainline module:
For regular devices, the wifi stack will be loaded into
the network stack process - WifiStack.apk.
For GO (low memory) devices, the wifi stack will be always
loaded into system_server - InProcessWifiStack.apk.

Bug: 113174748
Change-Id: I1a272cbbb6a5284850177db41ec27a6f6035bb03
2019-08-13 09:57:16 -07:00
Makoto Onuki
dc6e39523b Change SYSTEMSERVERCLASSPATH order
Move jobscheduler-service.jar to the end

Bug: 138793378
Test: Local clean build & botoed it
Change-Id: I70774c135b9ef0b7b6c0c1933eedaf9703519ea7
2019-08-02 10:38:48 -07:00
Makoto Onuki
78bd62f43c Add jobscheduler-service.jar to system server class path
This is part of the effort to make jobscheduler a mainline apex module.

Bug: 137763703
Test: build and boot
Test: atest CtsJobSchedulerTestCases
Change-Id: I9ed53bdb5ce5206c5a1ffee387d9c034c6b75001
2019-07-25 12:52:47 -07:00
Makoto Onuki
07d9e826ca Revert "Add jobscheduler-service.jar to system server class path"
This reverts commit d4d736a4de.

Reason for revert: My device didn't boot. :(

Change-Id: Ie4a1934c82b53790c5d60ff67d80e2add0576a58
2019-07-25 18:09:56 +00:00
Makoto Onuki
d4d736a4de Add jobscheduler-service.jar to system server class path
This is part of the effort to make jobscheduler a mainline apex module.

Bug: 137763703
Test: build and boot
Test: atest CtsJobSchedulerTestCases
Change-Id: I218f8c9ff6b397fe2301e33f2741b4a633e7a76c
2019-07-24 14:51:21 -07:00
Chong Zhang
07d4342fa5 Remove soft omx libs from package -- DO NOT MERGE
These are installed by media.codec as required modules,
and they're usually on vendor partition now. We don't
want to install the system targets here.

bug: 132466615

Change-Id: I8375563648bc2a5016dac4760b853cb32dde5429
2019-05-15 20:02:23 +00:00
Lajos Molnar
90917c898e media: make softomx plugin a plugin
This means removing libstagefright_softomx from VNDK, and adding
the plugin lib to PRODUCT_PACKAGES.

Bug: 129710438
Change-Id: Ie9bbc3fb38b06951bcafa27ea0691a6c0e7eb470
2019-05-06 16:03:51 -07:00
Dan Willemsen
4a70a19f84 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Dan Willemsen
086f8f002c Revert "First pass at creating PRODUCT_HOST_PACKAGES"
This reverts commit 7218a21ed0.

Reason for revert: broke some side branches, and the mac build

Change-Id: Ifa52f2dbf9a383f69e07ba0aceb4742b05376364
Fixes: 125912305
2019-02-22 22:02:23 +00:00
Dan Willemsen
7218a21ed0 First pass at creating PRODUCT_HOST_PACKAGES
This only defines PRODUCT_HOST_PACKAGES as a concept, and requires that
it contain at least all of the files that would be installed to the host
from PRODUCT_PACKAGES (minus libraries, as those are expected to be
installed based on what's required by other modules).

It does not actually change what will be built, that will happen in a
future change.

Test: build/soong/build_test.bash
Change-Id: Ie502b1a483f821b957cfd407c31a93e243896dae
2019-02-20 12:58:37 -08:00
TreeHugger Robot
6622ea852b Merge "Change the impl lib name of java_sdk_library" 2019-01-16 10:47:25 +00:00
Anton Hansson
cd7175d792 Merge "Remove webview from media_system.mk" am: e7f127491a am: 50ac1cb858
am: 513c0bc90c

Change-Id: I2d2aa70a509c5e916829284d5ddd53a9ef440d15
2019-01-16 02:09:00 -08:00
Anton Hansson
9b2f3af064 Remove webview from media_system.mk
It is present in media_vendor.mk (and soon media_product.mk),
which is the correct place.

Test: make
Change-Id: I7ffda211cf4b01a22ec01c661959defcf59bbc4b
2019-01-15 14:36:14 +00:00
Sundong Ahn
0372f189ac Change the impl lib name of java_sdk_library
The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar

Bug: 110404779
Test: m -j
Change-Id: I275cd40e3682640b96425e56698cea770888cbb1
2018-12-19 21:11:52 +09:00
Philip P. Moltmann
da2c3badf9 Split PackageInstaller app into installation and permissions management
The two components were mostly independant for a long time. Since
I1e80a3f5e63d02b3859ecf74af21ca4c61f96874 the installation flow does
not grant any permissions anymore and the last connection between these
parts was broken.

The new app "com.android.packageinstaller" in
frameworks/base/packages/PackageInstaller will only handle (side load)
package installtion and uninstallation.

The exisiting app will be renamed to "com.android.permissioncontroller"
and only handle permission granting and permission management.

This change set also updates the make files to install the two apps on
the appropriate devices.

Test: Installed + uninstalled packages
Change-Id: I37dda69218ea2a703a6379bb5bcbd3449b3360ad
2018-07-31 14:50:26 -07:00
Anton Hansson
c16e2b2878 Split core_minimal in two.
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.

Also update mainline_system to inherit media_system.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
2018-07-10 16:45:03 +01:00