satayev
2a6a04b99e
Simplify main function for mainline_modules_sdks.py am: 5511d9becd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903874
Change-Id: Ie1d5c5e78836b73124253da79c75cc5c1a231168
2021-11-26 15:09:18 +00:00
satayev
7a9b41feae
Allow passing python script as a parameter. am: 540616ff00
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903873
Change-Id: I43cd1b7ca85e89e840d1f989928e0e327f999c72
2021-11-26 15:09:09 +00:00
satayev
255bc5825d
[automerger skipped] Simplify main function for mainline_modules_sdks.py am: 5511d9becd -s ours
...
am skip reason: Merged-In I2fdd371aad6a9c37703a190754604da2d86975b2 with SHA-1 a584ab5dc0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903874
Change-Id: I6fb9fa85b560b525ca8676cf2b4bd46154a2104f
2021-11-26 15:08:27 +00:00
satayev
ce810d9444
[automerger skipped] Allow passing python script as a parameter. am: 540616ff00 -s ours
...
am skip reason: Merged-In Icb079d7630fa77c250e9b2194cc30038b6d046ec with SHA-1 8f8f1bd9c9 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1903873
Change-Id: If885c76288f993219b956d1423bd310ce151f1b7
2021-11-26 15:08:21 +00:00
satayev
5511d9becd
Simplify main function for mainline_modules_sdks.py
...
Bug: 205100626
Test: presubmit
Change-Id: I2fdd371aad6a9c37703a190754604da2d86975b2
Merged-In: I2fdd371aad6a9c37703a190754604da2d86975b2
(cherry picked from commit a584ab5dc0 )
2021-11-26 12:36:52 +00:00
satayev
540616ff00
Allow passing python script as a parameter.
...
This simplifies the setup for internal mainline_modules_sdks.sh and
removes duplication in logic.
Bug: 205100626
Test: TARGET_BUILD_APPS=com.android.wifi packages/modules/common/build/mainline_modules_sdks.sh && ls out/dist/mainline-sdks/current/com.android.wifi/sdk/wifi-module-sdk-current.zip
Change-Id: Icb079d7630fa77c250e9b2194cc30038b6d046ec
Merged-In: Icb079d7630fa77c250e9b2194cc30038b6d046ec
(cherry picked from commit 8f8f1bd9c9 )
2021-11-26 12:35:33 +00:00
Artur Satayev
f86e7c574f
Merge "Simplify main function for mainline_modules_sdks.py" into sc-mainline-prod
2021-11-26 11:58:14 +00:00
Treehugger Robot
fa3f148ecd
Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." am: 809a186e06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1875775
Change-Id: I28bfb1800e7c4e8a51603ef0e9fa67d0a00cab2b
2021-11-25 12:31:59 +00:00
Treehugger Robot
d92feb818d
Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto." am: 809a186e06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1875775
Change-Id: I8727cb90dae73b0e86b3edc3b5bd157f0b784025
2021-11-25 12:31:48 +00:00
Treehugger Robot
809a186e06
Merge "Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto."
2021-11-25 12:17:58 +00:00
Jiakai Zhang
89b88df157
Add STANDALONE_SYSTEMSERVER_JARS to classpath.proto.
...
This is an environment variable that lists the jars that system server
loads dynamically using separate classloaders. The list is derived from
PRODUCT_STANDALONE_SYSTEM_SERVER_JARS and
PRODUCT_APEX_PRODUCT_STANDALONE_SYSTEM_SERVER_JARS in Makefile. It will
be comsumed by odrefresh to determine what jars to preopt on early boot.
Note that the variable should not end with "CLASSPATH" because the list
is not used by runtime as a classpath. It is just a colon-separated list
of jars. System server loads the jars separately with paths hardcoded in
the code.
Bug: 203198541
Test: manual - 1. Build an image.
2. Flash the image to a device.
3. adb shell echo \$STANDALONE_SYSTEMSERVER_JARS
4. See the correct list of jars.
Change-Id: I5a9653c606969aaa8083e8c8daa9d48b99663790
2021-11-25 10:48:25 +00:00
satayev
a584ab5dc0
Simplify main function for mainline_modules_sdks.py
...
Bug: 205100626
Test: presubmit
Ignore-AOSP-First: internal topic. will cp later
Change-Id: I2fdd371aad6a9c37703a190754604da2d86975b2
2021-11-24 18:58:21 +00:00
Jooyung Han
756c123b6e
Merge "Revert "Remove redundant lines in allowed_deps.txt"" am: bd5e510a29
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1901433
Change-Id: Ia0a44b9473c825d1848832e1833d9fae83074b2b
2021-11-24 06:37:06 +00:00
Jooyung Han
04e4020aad
Merge "Revert "Remove redundant lines in allowed_deps.txt"" am: bd5e510a29
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1901433
Change-Id: I216e162ab307c3a265a48747e08943f62bf7186c
2021-11-24 06:36:54 +00:00
Jooyung Han
bd5e510a29
Merge "Revert "Remove redundant lines in allowed_deps.txt""
2021-11-24 06:21:15 +00:00
Nahian Ashraf
28f82df646
Revert "Remove redundant lines in allowed_deps.txt"
...
This reverts commit 48217f59e4 .
Reason for revert: Build Breakage
Change-Id: I84d8b136fee7ddd58af44a9054535dad530cb5db
2021-11-24 05:43:51 +00:00
Treehugger Robot
b668fba6b3
Merge "Remove redundant lines in allowed_deps.txt" am: 9e6046ceab
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900130
Change-Id: I3df2476af3416845b6369218dd19f98b04775b9b
2021-11-24 03:58:43 +00:00
Treehugger Robot
2e325598d5
Merge "Remove redundant lines in allowed_deps.txt" am: 9e6046ceab
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1900130
Change-Id: I958c50abd4db1df154405473f10c28fe879e4af4
2021-11-24 03:58:23 +00:00
Treehugger Robot
9e6046ceab
Merge "Remove redundant lines in allowed_deps.txt"
2021-11-24 03:47:37 +00:00
Artur Satayev
3adcf517d4
Merge "Allow passing python script as a parameter." into sc-mainline-prod
2021-11-23 14:36:28 +00:00
David Gross
e2e6aa23e6
Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." am: c02a06e229
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881328
Change-Id: Ic64989deb2f3b15fd1bd45458b6cf04073d148ad
2021-11-23 02:30:43 +00:00
David Gross
e17d059f56
Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps." am: c02a06e229
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1881328
Change-Id: I85d88afb09b8e5cf2bbce9187e304df288fc3cb7
2021-11-23 02:30:37 +00:00
David Gross
c02a06e229
Merge "Add android.hardware.neuralnetworks-V3-ndk to allowed_deps."
2021-11-23 02:18:53 +00:00
Jooyung Han
8b1d5b52b9
Set min_sdk_version (packages/modules/adb) am: ea45530b22
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1895325
Change-Id: I1996b54c87ef95ce6b69b49323dc282ba90ac569
2021-11-22 23:22:10 +00:00
Jooyung Han
48217f59e4
Remove redundant lines in allowed_deps.txt
...
Since allowed_deps.txt only grows, there remain some redundant lines
when we set min_sdk_version modules which were tracked via
minSdkVersionAllowlist.
Manually removed these lines.
Bug: n/a
Test: m out/soong/apex/depsinfo/new-allowed-deps.txt.check
Change-Id: I7f81c5a580de2dce97d1fc2e88137f50b0a088e9
2021-11-23 08:19:05 +09:00
Jooyung Han
5f20127587
Set min_sdk_version (packages/modules/adb) am: ea45530b22
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1895325
Change-Id: I92d6c95b3b98db53f68150536a262bcdfab36278
2021-11-22 23:07:54 +00:00
David Gross
b76f6ec731
Add android.hardware.neuralnetworks-V3-ndk to allowed_deps.
...
Apex-Size-Increase: N/A
Previous-Platform-Support: 30
Aosp-First: Yes
Ignore-AOSP-First: merge conflict resolutions
Test-Info: NeuralNetworksTest_static,VtsHalNeuralnetworksTargetTest
Bug: 202280917
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksTargetTest
Merged-In: Ie9a45baca54ff6a6a95d4e78ac19a32741c2b0c7
Change-Id: Ie9a45baca54ff6a6a95d4e78ac19a32741c2b0c7
(cherry picked from commit 2fa8ac669f )
2021-11-22 14:39:36 -08:00
Jooyung Han
ea45530b22
Set min_sdk_version (packages/modules/adb)
...
Many modules requiring min_sdk_version have been used without setting
it, but hard-coded in allowlist.
Bug: 158059172
Test: m
Change-Id: Id5e0794b1ff31fc103185851b7a54c2aded2fe6f
2021-11-22 11:30:19 +09:00
Taras Antoshchuk
89757bb670
Merge "Remove NetworkStackNext from build script" into sc-mainline-prod
2021-11-18 21:58:56 +00:00
Jiakai Zhang
bedf78ed6b
Merge "Add new allowed dependency "libc++fs"." am: bbafb74821
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1891375
Change-Id: I0ed72b81c5bbba2eec51dc770261b662d77519b2
2021-11-17 10:57:11 +00:00
Jiakai Zhang
65a2f6c771
Merge "Add new allowed dependency "libc++fs"." am: bbafb74821
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1891375
Change-Id: I6d944394f41c297ebd330a8130afbb86f6386b99
2021-11-17 10:56:54 +00:00
Jiakai Zhang
bbafb74821
Merge "Add new allowed dependency "libc++fs"."
2021-11-17 10:39:48 +00:00
TreeHugger Robot
4e4dbfdc31
Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
2021-11-17 09:26:57 +00:00
Xiao Ma
1adb1e40fa
Add networkstack-aidl-interfaces-V13 to allowed_deps.
...
Apex-Size-Increase: negligible
Just replace networkstack-aidl-interfaces-V12 with V13 which has one
more callback api in IIpClientCallbacks and a stable parcelable.
Previous-Platform-Support: Yes, support previous platform releases
Aosp-First: Yes
Test-Info: all unit tests and integration tests related to NetworkStack
Bug: 204723906
Test: m
Change-Id: I22ae460feeec160cb8598232ca3c603d08e19b52
2021-11-17 07:46:41 +00:00
Hui Wang
825dbe59e4
Merge "Apply new settings widget lib for cbr roaming feature support" into sc-mainline-prod
2021-11-17 07:20:20 +00:00
satayev
df6554e6b6
Merge "Change min max sdk version type to string." am: bc58c17620
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885513
Change-Id: I3262f1917261381d5a77d330ec616a1272277f6a
2021-11-15 21:54:17 +00:00
satayev
1b8e11673c
Merge "Change min max sdk version type to string." am: bc58c17620
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885513
Change-Id: I3723f80e81562a5f8aa1d94f3350199060b81001
2021-11-15 21:53:35 +00:00
satayev
bc58c17620
Merge "Change min max sdk version type to string."
2021-11-15 21:41:03 +00:00
satayev
8f8f1bd9c9
Allow passing python script as a parameter.
...
This simplifies the setup for internal mainline_modules_sdks.sh and
removes duplication in logic.
Bug: 205100626
Test: TARGET_BUILD_APPS=com.android.wifi packages/modules/common/build/mainline_modules_sdks.sh && ls out/dist/mainline-sdks/current/com.android.wifi/sdk/wifi-module-sdk-current.zip
Change-Id: Icb079d7630fa77c250e9b2194cc30038b6d046ec
2021-11-15 21:15:41 +00:00
Taras Antoshchuk
563e68335b
Remove NetworkStackNext from build script
...
NetworkStackNext is not expected to compile on sc-mainline-prod.
Test: presubmit
Change-Id: Id1586da283046409a689fe7bb12ed905b6cd63d1
Ignore-AOSP-First: this change is sc-mainline-prod specific.
Merged-In: I48e8b9422c8703cd4cec6552e0dcfd3b82021816
2021-11-15 13:31:36 +01:00
Jiakai Zhang
2e20043b65
Add new allowed dependency "libc++fs".
...
Bug: 205276874
Test: m nothing
Apex-Size-Increase: 40KB (or 0.1% of the ART APEX)
Previous-Platform-Support: yes (The library is statically linked.)
Aosp-First: yes
Test-Info: See above
Change-Id: I46d086079c0b0fa83455f898fb7328b94c761fb4
2021-11-12 21:19:04 +00:00
Martin Stjernholm
6b11ad21eb
Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" am: 7a23a009f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1884792
Change-Id: I831c8bba377ace6caa196c9ba3d2ea16b46c987d
2021-11-12 12:54:26 +00:00
Martin Stjernholm
772209952d
Merge "Revert "Add back symbolic "S" versions for the ART exported libs."" am: 7a23a009f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1884792
Change-Id: Ibd2bf72c649567fb65ed50523085ccb5d13fe85d
2021-11-12 12:54:11 +00:00
Martin Stjernholm
7a23a009f6
Merge "Revert "Add back symbolic "S" versions for the ART exported libs.""
2021-11-12 12:32:14 +00:00
Bob Badour
b33681347a
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: de258df0ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1889597
Change-Id: I7ba8f8c585dedb7162662e0748b6adf78f83284e
2021-11-11 23:57:38 +00:00
Bob Badour
1a2798d370
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common am: de258df0ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1889597
Change-Id: I886a4980e27351fdf4ce1ffc3e520e2d9e0d1ca7
2021-11-11 23:57:26 +00:00
Bob Badour
de258df0ae
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/common
...
Added SPDX-license-identifier-Apache-2.0 to:
build/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Change-Id: I6ee34b2b64c60bc33d9a8169b956a49ad97099e1
2021-11-11 10:36:43 -08:00
Treehugger Robot
221254a590
Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3 am: 7ade263d19
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063
Change-Id: Ib0c69d6602ae630603852b4dcda1d82c7ca2ad1e
2021-11-11 14:32:54 +00:00
Treehugger Robot
7ade263d19
Merge "Migrate NetworkStack modules to use modules-utils" am: 0305f80cb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1882063
Change-Id: I3d7880865b5fc879936eca2a14c45dfc1231e3ad
2021-11-11 14:14:46 +00:00
Maciej Żenczykowski
619e43390e
Merge "Add net-utils-device-common-bpfjni to allow_deps.txt" am: b69169da75 am: 5bdf2de8e4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1885710
Change-Id: Ieeeca0129f468cf0cdc8b73231e144d51936719a
2021-11-11 14:02:59 +00:00