Commit graph

58141 commits

Author SHA1 Message Date
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
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
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
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
Steven Moreland
569f080bd4 Merge "vintf vibrator vndk" am: fcd0862632 am: 3c0a874fbf
am: aa614c7d59

Change-Id: Ieffdb06007e14ddcbb36370ed1e2bfdef18d0d19
2019-11-25 09:52:03 -08:00
Steven Moreland
aa614c7d59 Merge "vintf vibrator vndk" am: fcd0862632
am: 3c0a874fbf

Change-Id: Id482abff67c242852cf3904130ff2d14db568957
2019-11-25 09:46:05 -08:00
Steven Moreland
3c0a874fbf Merge "vintf vibrator vndk"
am: fcd0862632

Change-Id: I9ef2e3dd925d96ac777fd6ba784864bf6ddbe081
2019-11-25 09:39:57 -08:00
Steven Moreland
fcd0862632 Merge "vintf vibrator vndk" 2019-11-25 17:31:26 +00:00
Ulya Trafimovich
3fb6a949a6 Do not dexpreopt system server jars from updatable modules.
Test: m

Test: The list of updatable system server jars is empty now,
  so I tested that the filer works with a manual experiment:
  - temporarily add wifi-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
  - m nothing
  - fgrep -e 'wifi-service dexpreopt' $ANDROID_BUILD_TOP/out/build-$TARGET_PRODUCT.ninja
  - expect empty output (no dexpreopt command is generated)

Change-Id: Ia4206ccc263b535b6e39b54c6e8db28845ff2bf5
2019-11-25 16:36:52 +00:00
Xin Li
3005074420 [automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master am: 8974b44505 -s ours
am: b3de727d95 -s ours
am skip reason: change_id Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9 with SHA1 c68e033695 is in history

Change-Id: I942d7eeaa759c0d519066d46f62c78dae0f21820
2019-11-25 08:03:41 -08:00
Xin Li
264b472520 [automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 8ad8d1bc6e -s ours
am: ff273d580d -s ours
am skip reason: change_id Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9 with SHA1 c68e033695 is in history

Change-Id: I5c233ab881a7f32643c434cd3d7e8547e4252fa4
2019-11-25 07:49:53 -08:00
Steven Laver
67bcf129f5 Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472ff9 am: 338f16c2df
am: 015686445c

Change-Id: I7edca53a72db574ad03f14f5d9c32ea64ae6b48c
2019-11-25 07:48:23 -08:00
Benedict Wong
1023921d76 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8 am: 97239f3c3e
am: 582fcc3ad2

Change-Id: Ifd4a1e7d3e387877cc81757417d6ef4154323bbf
2019-11-25 07:16:44 -08:00
Anton Hansson
c5ece221b2 Merge "Update references to service jars" 2019-11-25 13:15:57 +00:00
Xin Li
b3de727d95 [automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master
am: 8974b44505 -s ours
am skip reason: change_id Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9 with SHA1 c68e033695 is in history

Change-Id: I54d674e3fbba5c08c3f601437bafe1f63972bc71
2019-11-23 23:55:59 -08:00
Xin Li
ff273d580d [automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master
am: 8ad8d1bc6e -s ours
am skip reason: change_id Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9 with SHA1 c68e033695 is in history

Change-Id: If9339b3101beebf5e74996aadfae4c4f7da23906
2019-11-23 23:46:04 -08:00
TreeHugger Robot
8974b44505 Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master 2019-11-24 07:37:08 +00:00
Steven Laver
015686445c Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472ff9
am: 338f16c2df

Change-Id: I120884c2058d4095c8d462c494e0b7e4d8c8edae
2019-11-23 07:27:19 -08:00
Steven Laver
338f16c2df Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt"
am: 1567472ff9

Change-Id: I516ca816ae086aa1a17e58a7bf1524f922700cd0
2019-11-23 07:24:49 -08:00
Treehugger Robot
1567472ff9 Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" 2019-11-23 15:18:33 +00:00
Benedict Wong
582fcc3ad2 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8
am: 97239f3c3e

Change-Id: Ia36051827a05e1fb09e4dcef7cf43953ceb24d1b
2019-11-22 20:18:30 -08:00
Benedict Wong
97239f3c3e Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
am: f81965bdc8

Change-Id: Ica29d14159e4bdf0b330322493531834106a2c76
2019-11-22 20:10:09 -08:00
Benedict Wong
f81965bdc8 Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
* changes:
  Add ike.jar to bootclasspath to expose IKE API
  Add com.android.ipsec APEX to base makefile
2019-11-23 03:45:53 +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
b318e9931e Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619
am: 20cc65daed

Change-Id: Ic97d9b992b06c6d0c34f21dd31e6783e1a06206d
2019-11-22 19:18:01 -08:00
Roshan Pius
20cc65daed Merge "base_system.mk: Support system_server jars from apexes"
am: 9dda264619

Change-Id: Ie5ad1cb9e89070adb95fe5ad2a69f8b0dabf899a
2019-11-22 19:15:39 -08:00
Roshan Pius
9dda264619 Merge "base_system.mk: Support system_server jars from apexes" 2019-11-23 03:09:35 +00:00