Commit Graph

63294 Commits

Author SHA1 Message Date
Paul Duffin
70dd47f0df Fail check-boot-jars if boot jar contains 0 .class files
Protect against an invalid boot jar, e.g. one containing .dex files is
used instead of .class files.

Test: add a prebuilt for framework-tethering
      Run `m check-boot-jars` with the first fix from
	  https://r.android.com/1341756 and the build fails due to no
	  .class files because a dex jar is used.
	  Run `m check-boot-jars` with all fixeds from
	  https://r.android.com/1341756 and the build works.
Bug: 158304459
Bug: 159112414
Merged-In: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
(cherry picked from 92d41de8f2)
2020-06-18 14:17:57 +00:00
Paul Duffin
afa85599e1 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: b96c9c352f am: 30ae560881
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I7356ca885e695abffebb8b6eb12e291c2770a7fc
2020-06-18 13:09:17 +00:00
Paul Duffin
b36353a41f Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268 am: 734da4e9df
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I79496d24ceb9d59574933a2432963d04ae6ca3aa
2020-06-18 13:08:57 +00:00
Paul Duffin
e6f242d976 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268 am: de3452fce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: Ibfb3d1bc618b1fac862b79d648ba7f24d1136405
2020-06-18 13:08:41 +00:00
Paul Duffin
30ae560881 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: b96c9c352f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I379031ea1d6104ab4196be2b722dd8285aa5b05d
2020-06-18 12:52:30 +00:00
Paul Duffin
de3452fce2 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: Iaefa8978cc068a95bb3d6dc5a9aa7cae45c23a5d
2020-06-18 12:51:46 +00:00
Paul Duffin
734da4e9df Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I742f275b70657e58009d6c19a5574f0479d15a74
2020-06-18 12:51:30 +00:00
Paul Duffin
b96c9c352f Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I169c520207e748f01ab6119dffa901e5f3cfb68b
2020-06-18 12:30:31 +00:00
Paul Duffin
9f58d77268 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I7b0884a337f3842dad52cdaff17797c6100eccb2
2020-06-18 12:30:09 +00:00
Paul Duffin
c5fd7066f5 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev 2020-06-18 12:16:47 +00:00
Jeongik Cha
9917520fc2 notice files in system_other becomes included in system's one
system_other is relevant partition to system over vendor.
so move notice files from system_other from vendor to system

Bug: 159189171
Test: m nothing && check ninja dependency
Change-Id: Ib69bd3faae03f174671d5db8366a59b7d28a9d9d
2020-06-18 20:44:51 +09:00
Treehugger Robot
a37b5f4044 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164 am: 04fe384a31 am: fe6a129cb3 am: f5b4ce5d99
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: Ibbf604593a55c29056eba2d595d4972c176c5cdf
2020-06-18 08:46:00 +00:00
Treehugger Robot
f5b4ce5d99 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164 am: 04fe384a31 am: fe6a129cb3
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: Ib01ccb135464401dad044acbbd3deb508a84cb44
2020-06-18 08:33:41 +00:00
Jing-yan, Jang
bb4510f2cf Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: 08ab3caa0c am: 19ba278a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I40105362e9c6d97c13f69ca69ee7c415a85f7dfc
2020-06-18 08:22:33 +00:00
Treehugger Robot
fe6a129cb3 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164 am: 04fe384a31
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: I84acec731634c77ba55851193258e070fa9871c7
2020-06-18 08:15:02 +00:00
Jing-yan, Jang
ee3c5c054c Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: 08ab3caa0c am: b74357aab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I794a482cb1c1dc0825e715b5a49f490ab1993021
2020-06-18 08:02:49 +00:00
Jing-yan, Jang
19ba278a63 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: 08ab3caa0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: If3f94fce72391dad8bbd9db403cb36cfe55f1031
2020-06-18 08:01:38 +00:00
Treehugger Robot
04fe384a31 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: Idc62b60284dfbe98266444ef9d5f65f27df70aaa
2020-06-18 07:27:50 +00:00
Jing-yan, Jang
6c5d611c73 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: a46fd29698 am: bf422f8a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: Ib5b034b1da89a6e3f5544eae96d56e53fe717694
2020-06-18 07:17:45 +00:00
Treehugger Robot
7270150164 Merge "Mark jni libs as REQUIRED by their app" 2020-06-18 07:12:33 +00:00
Jing-yan, Jang
bf422f8a63 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: a46fd29698
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I8e453db612634013f49ed92673645ffe6b21162f
2020-06-18 07:05:52 +00:00
Jing-yan, Jang
b74357aab7 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: 08ab3caa0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: Id672a9ecc14d58822346e9ea6cb00fa8dfdb087e
2020-06-18 06:57:24 +00:00
Jing-yan, Jang
a46fd29698 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I6154f915c8ddb457fcbbf4cb8acdafe89b1dab16
2020-06-18 06:54:01 +00:00
Jing-yan, Jang
08ab3caa0c Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I65b41cb1fc9f933cc2e909d0b6256ad71d56c8c8
2020-06-18 06:52:50 +00:00
Jing-yan, Jang
dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
sophiez
cb00590712 NDK api code coverage
Update parsed NDK api xml file directory name.

Test: m ndk
Forrest test build pass: http://shortn/_E5mhRtD4zW

Change-Id: Ic20780d969e33103c45953c9cdd81efe4262b4a9
2020-06-17 23:01:21 +00:00
TreeHugger Robot
03a2c57021 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 588cb3cc06 am: 7a3cc16032
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Iaf4759754e96cb5d779ee5b7f9236cab93016bc5
2020-06-17 21:38:47 +00:00
TreeHugger Robot
009c07598c Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 4763cf420d am: cc461b755a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: I3bd514d6e2dcbdfc4b10189c03443f005c9653b4
2020-06-17 21:37:01 +00:00
TreeHugger Robot
9357c9766c Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 4763cf420d am: 0e868862c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ia1208be044b93a9b8008c3393f9ee7183a5cbf3b
2020-06-17 21:36:21 +00:00
TreeHugger Robot
7a3cc16032 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 588cb3cc06
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: I61a05b80f599cbf733ff28bd3f208199a5944d35
2020-06-17 21:15:12 +00:00
TreeHugger Robot
cc461b755a Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 4763cf420d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: I74e00962b11efe63bc5b1706d661b368b04f10f3
2020-06-17 21:14:36 +00:00
TreeHugger Robot
0e868862c3 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 4763cf420d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ia00cd67fac94a523030d6ddd4ca3f27d7c57e73e
2020-06-17 21:14:13 +00:00
TreeHugger Robot
588cb3cc06 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ibb6f34cc37ea3b6bc269b8a73073807f0d02f0ae
2020-06-17 21:01:59 +00:00
TreeHugger Robot
4763cf420d Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ic413b355c44381b8d386f91492a538f835850216
2020-06-17 21:01:05 +00:00
TreeHugger Robot
ddca499c5c Merge "Remove ANGLE from base_system.mk" into rvc-dev 2020-06-17 20:34:06 +00:00
Tim Van Patten
25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
TreeHugger Robot
7739703a1d Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: 9f24742ee3 am: fbe754fcf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I71ef9204ecaef2ffe1a23d0713a7be9c4b83eca8
2020-06-17 18:34:30 +00:00
TreeHugger Robot
5153480173 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: 9f24742ee3 am: 3f2dfa969c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I601f6de5056223667efac85c342836a1295b05da
2020-06-17 18:23:25 +00:00
TreeHugger Robot
f9a0db4d06 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: d8b16dcab4 am: aac96c1190
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I6dbf236d6c860e3d8d65fe538cb0726144304c48
2020-06-17 18:23:11 +00:00
Martin Stjernholm
4a69664fd1 Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537 am: 34012c5e06 am: bdaca3a793 am: 964568d0ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406

Change-Id: If67ce393e45ab82922ed2d078851ade64e0c8557
2020-06-17 18:23:03 +00:00
Sophie Zheng
ceb25587d1 Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b am: a38bfeab4e am: fbfb207232 am: eac571204a
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: I619f8da5c4aa073bda0e991e27ed35947ec6c483
2020-06-17 18:22:47 +00:00
TreeHugger Robot
3f2dfa969c Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: 9f24742ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: Ib4f2c9a7c5a2970ab18bc08a91f7e04e55ba8bc8
2020-06-17 18:17:58 +00:00
TreeHugger Robot
fbe754fcf1 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: 9f24742ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: Id3671e3048a6b059d404861297327b405f2f4738
2020-06-17 18:16:49 +00:00
TreeHugger Robot
aac96c1190 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: d8b16dcab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: Id84212578fc61b8941f1e4a746027132980cab87
2020-06-17 18:03:11 +00:00
Martin Stjernholm
964568d0ac Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537 am: 34012c5e06 am: bdaca3a793
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406

Change-Id: I98790d31b09d0733138babd0e3646caef8c982b9
2020-06-17 18:03:04 +00:00
Sophie Zheng
eac571204a Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b am: a38bfeab4e am: fbfb207232
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: I9024fe8e2e2245e7cb9b5b6b75887dbce3e52f56
2020-06-17 18:02:56 +00:00
TreeHugger Robot
d8b16dcab4 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I59e68fca3916d07490f0cab90060ce1dbb1d7e01
2020-06-17 18:02:30 +00:00
TreeHugger Robot
9f24742ee3 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: If454a182b9e5b13b6704376d65fb7eeb8c724504
2020-06-17 18:02:30 +00:00
TreeHugger Robot
f854cf8317 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev 2020-06-17 17:51:25 +00:00
Martin Stjernholm
bdaca3a793 Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537 am: 34012c5e06
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406

Change-Id: I0bafa9d0165d1b0590240a57d7a88f686661aa16
2020-06-17 17:49:02 +00:00