Skip to content

Commit 82dca82

Browse files
committed
Minor addition of packages, still has issues.
1 parent 6460681 commit 82dca82

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

docker/android-system.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ EOF
9393
python3 ./repo sync -c external/compiler-rt
9494
python3 ./repo sync -c external/elfutils
9595
if [[ "${major_version}" -ge 10 ]]; then
96-
python3 ./repo sync -c external/golang-protobuf/proto
96+
python3 ./repo sync -c external/golang-protobuf
9797
fi
9898
python3 ./repo sync -c external/jemalloc
9999
python3 ./repo sync -c external/libcxx
@@ -113,6 +113,9 @@ EOF
113113
python3 ./repo sync -c external/zlib
114114
python3 ./repo sync -c frameworks/hardware/interfaces
115115
python3 ./repo sync -c hardware/interfaces
116+
if [[ "${major_version}" -ge 10 ]]; then
117+
python3 ./repo sync -c kernel/configs
118+
fi
116119
python3 ./repo sync -c libnativehelper
117120
python3 ./repo sync -c prebuilts/build-tools
118121
python3 ./repo sync -c prebuilts/clang/host/linux-x86
@@ -123,11 +126,23 @@ EOF
123126
fi
124127
python3 ./repo sync -c prebuilts/misc
125128
python3 ./repo sync -c prebuilts/sdk
129+
if [[ "${major_version}" -ge 10 ]]; then
130+
python3 ./repo sync -c prebuilts/vndk/v28
131+
fi
126132
python3 ./repo sync -c system/core
127133
if [[ "${major_version}" -ge 8 ]]; then
128134
python3 ./repo sync -c system/libhidl
129135
python3 ./repo sync -c system/tools/hidl
130136
fi
137+
if [[ "${major_version}" -ge 10 ]]; then
138+
python3 ./repo sync -c system/libvintf
139+
python3 ./repo sync -c system/sepolicy
140+
python3 ./repo sync -c system/tools/xsdc
141+
# needed for libvintf
142+
python3 ./repo sync -c test/vts
143+
fi
144+
145+
131146

132147
case "${arch}" in
133148
arm)
@@ -154,6 +169,8 @@ EOF
154169
rm bionic/tests/libs/Android.bp
155170
rm bionic/tests/headers/Android.bp
156171
rm bionic/tests/headers/posix/Android.bp
172+
rm system/libvintf/xsd/compatibilityMatrix/vts/Android.mk
173+
rm system/libvintf/xsd/compatibilityMatrix/vts/Android.bp
157174

158175
sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_debug/Android.bp
159176
sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_hooks/Android.bp

0 commit comments

Comments
 (0)