Commit Graph

31837 Commits

Author SHA1 Message Date
Kelvin Zhang
091a8fb955 Merge "Support docker for ota generator" 2021-07-29 12:54:42 +00:00
Kiyoung Kim
bad320b3b0 Merge "Install etc files with VSDK" am: 53f2c95791 am: 396449cfd3 am: 8407b402a6
Original change: https://android-review.googlesource.com/c/platform/development/+/1781807

Change-Id: I25c21802c04a6ff9f788b11fc4b6a31f93c5f3d8
2021-07-29 07:56:31 +00:00
Kiyoung Kim
8407b402a6 Merge "Install etc files with VSDK" am: 53f2c95791 am: 396449cfd3
Original change: https://android-review.googlesource.com/c/platform/development/+/1781807

Change-Id: I2c941b1fcfe29059b0035790a51083dc871b78f6
2021-07-29 07:40:03 +00:00
Kiyoung Kim
396449cfd3 Merge "Install etc files with VSDK" am: 53f2c95791
Original change: https://android-review.googlesource.com/c/platform/development/+/1781807

Change-Id: I9fa237514b6ebe7b1c380f272183c7da9a89d962
2021-07-29 07:17:00 +00:00
Kiyoung Kim
53f2c95791 Merge "Install etc files with VSDK" 2021-07-29 07:01:36 +00:00
Kiyoung Kim
3d0ed7691d Install etc files with VSDK
Create snapshot_etc module in the Android.bp, so etc files in the
snapshot can be used from the build.

Bug: 192430376
Test: tested locally to check if update.py creates snapshot_etc module
and build succeeds

Change-Id: I4cc533d8a0a378dc94d0b780ea2972cd8c6314f4
2021-07-29 14:38:54 +09:00
Kelvin Zhang
d689350756 Support docker for ota generator
Test: docker run -it -p 8000:8000 -v target:/app/target -v
output:/app/output zhangxp1998/test:latest

Change-Id: Ife050e6a8c85f2d40aff82a752b19f27c2ab23c5
2021-07-28 22:44:34 -04:00
Treehugger Robot
562c9f6ba8 Merge "Speed up the payload.bin read in process." am: 1a86d98b6e am: 261de8cf63 am: d60a7bf334
Original change: https://android-review.googlesource.com/c/platform/development/+/1777971

Change-Id: I2b0859351eae1fe3d5e5b88d8f229b4dfb11d2f6
2021-07-29 02:17:16 +00:00
Treehugger Robot
d60a7bf334 Merge "Speed up the payload.bin read in process." am: 1a86d98b6e am: 261de8cf63
Original change: https://android-review.googlesource.com/c/platform/development/+/1777971

Change-Id: Id3330ed4f450df68740ff88feff51c35e37ab1c1
2021-07-29 02:03:36 +00:00
Treehugger Robot
261de8cf63 Merge "Speed up the payload.bin read in process." am: 1a86d98b6e
Original change: https://android-review.googlesource.com/c/platform/development/+/1777971

Change-Id: I8fc9f86ca8240ce269ca3dc93f510c52a78485da
2021-07-29 01:50:41 +00:00
Treehugger Robot
1a86d98b6e Merge "Speed up the payload.bin read in process." 2021-07-29 01:37:02 +00:00
Kelvin Zhang
e5eb5c9d38 Speed up the payload.bin read in process.
A 700MiB OTA package now takes only 100ms to read in, compared with
7000ms previously. That's 70x faster.

When parsing the update_metadata in payload.bin, the entire file has to
be read in previously, because zip.js does not support partial read-in.
In fact, only a small portion of the payload.bin is update_metadata.
Reading the entire payload.bin not only slows down the process but also
occupy excessive memory.

The new class OTAPayloadBlobWriter (inherited from zip.Writer) will read
in the metadata (header, manifest, signature) and throw an StopIteration
exception when finished.

Test: open a large OTA package
Change-Id: Iebf8045325dae9a118d9d8ea5674872aa7c280c4
2021-07-28 23:38:51 +00:00
Treehugger Robot
6030866ba7 Merge "Fix a compatibility issue: getBigUint64." am: 74232e7a3f am: 2daf325668 am: 97c97755ba
Original change: https://android-review.googlesource.com/c/platform/development/+/1781348

Change-Id: Ib2e718f45ed0087ddd7b990fd7c1d8ede1fb62a5
2021-07-28 22:29:40 +00:00
Treehugger Robot
97c97755ba Merge "Fix a compatibility issue: getBigUint64." am: 74232e7a3f am: 2daf325668
Original change: https://android-review.googlesource.com/c/platform/development/+/1781348

Change-Id: I7ac345518e30dcc8cb7929e89518ab6b160b3442
2021-07-28 22:15:34 +00:00
Treehugger Robot
2daf325668 Merge "Fix a compatibility issue: getBigUint64." am: 74232e7a3f
Original change: https://android-review.googlesource.com/c/platform/development/+/1781348

Change-Id: I5299018a9d5d01fc02693d749af9646f54c0da41
2021-07-28 22:03:39 +00:00
Treehugger Robot
74232e7a3f Merge "Fix a compatibility issue: getBigUint64." 2021-07-28 21:50:02 +00:00
Treehugger Robot
f3510f9a09 Merge changes I36beff43,Iab7275b9 am: 503e12a866 am: 4d21078ab9 am: e71ef39842
Original change: https://android-review.googlesource.com/c/platform/development/+/1781347

Change-Id: I2ec3798e17b285a94a6462f8ff32e1f2c6d924af
2021-07-28 20:34:48 +00:00
Treehugger Robot
7d4570f234 Merge "Add prebuild and postbuild info to OTA_analysis." am: afcbcc7149 am: 2b8dd5e2b4 am: 49da6642eb
Original change: https://android-review.googlesource.com/c/platform/development/+/1779885

Change-Id: Ice2dc514981ea936f4773bfa398922dec025bdcc
2021-07-28 20:34:34 +00:00
lishutong
ff2b99cd89 Fix a compatibility issue: getBigUint64.
The method getBigUint64 is not supported by safari until version 15:
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView/getBigUint64
This CL mannual reload this method.

Test: Mannual tested.
Change-Id: I1d967eda93f9f628fb7f0f5d9f90efb92429ed5e
2021-07-28 20:31:37 +00:00
Treehugger Robot
e71ef39842 Merge changes I36beff43,Iab7275b9 am: 503e12a866 am: 4d21078ab9
Original change: https://android-review.googlesource.com/c/platform/development/+/1781347

Change-Id: Ibc02cc4e8879b290f5826f691a21f8bf400cb291
2021-07-28 20:10:50 +00:00
Treehugger Robot
49da6642eb Merge "Add prebuild and postbuild info to OTA_analysis." am: afcbcc7149 am: 2b8dd5e2b4
Original change: https://android-review.googlesource.com/c/platform/development/+/1779885

Change-Id: I12447e612c6e8191feadf72482a9edf8aefadd1b
2021-07-28 20:10:43 +00:00
Treehugger Robot
4d21078ab9 Merge changes I36beff43,Iab7275b9 am: 503e12a866
Original change: https://android-review.googlesource.com/c/platform/development/+/1781347

Change-Id: I123077099e93450f6f24c02b1bd23e68d43b46b9
2021-07-28 19:56:45 +00:00
Treehugger Robot
2b8dd5e2b4 Merge "Add prebuild and postbuild info to OTA_analysis." am: afcbcc7149
Original change: https://android-review.googlesource.com/c/platform/development/+/1779885

Change-Id: I9c6d5c6f770e71de3722277d2211e240e856ed32
2021-07-28 19:56:37 +00:00
Treehugger Robot
503e12a866 Merge changes I36beff43,Iab7275b9
* changes:
  Fix a bug: redirect to homepage for some url.
  Fix a bug: multiple flags in ota generator.
2021-07-28 19:49:12 +00:00
Treehugger Robot
afcbcc7149 Merge "Add prebuild and postbuild info to OTA_analysis." 2021-07-28 19:47:03 +00:00
Yuntao Xu
6de473cbe7 Merge "Convert Levels/Android.mk to Android.bp" am: ec91659823 am: 7c7034f02a am: cc5ca54b05
Original change: https://android-review.googlesource.com/c/platform/development/+/1709407

Change-Id: I6dd2d2426881edc6fca6d8ef5ffc8579e645bc65
2021-07-28 18:51:23 +00:00
Yuntao Xu
cc5ca54b05 Merge "Convert Levels/Android.mk to Android.bp" am: ec91659823 am: 7c7034f02a
Original change: https://android-review.googlesource.com/c/platform/development/+/1709407

Change-Id: I690b09534e94577dcc91686789678efe58e004e9
2021-07-28 18:29:17 +00:00
lishutong
30f991bf6e Fix a bug: redirect to homepage for some url.
In a single page application, the url sometimes does not correspond to
the actual resources on the server. Thus, it might cause 404 when users
refresh the page. By redirecting this kind of url back to the homepage,
the proper page can be rendered. If the url does not exist, the front
end will redirect to a Not Found page.

Test: mannual tested.
Change-Id: I36beff436a450ae7fcabe9172df9c7cc217d7305
2021-07-28 18:14:35 +00:00
Yuntao Xu
7c7034f02a Merge "Convert Levels/Android.mk to Android.bp" am: ec91659823
Original change: https://android-review.googlesource.com/c/platform/development/+/1709407

Change-Id: I46544ab195344ceda06690b26739c7217df2da9d
2021-07-28 18:11:25 +00:00
Yuntao Xu
ec91659823 Merge "Convert Levels/Android.mk to Android.bp" 2021-07-28 17:56:13 +00:00
lishutong
c4b3dd1aef Fix a bug: multiple flags in ota generator.
Previously, when multiple extra flags are set, the subprocess.run
can start generation properly. Now this is fixed.

Test: mannual tested.
Change-Id: Iab7275b9058a088d1fafd8c445c7f0775626c1ba
2021-07-28 17:51:31 +00:00
lishutong
ad6b75df3d Add prebuild and postbuild info to OTA_analysis.
The metadata file in ota package contains prebuild and postbuild info,
now the basic info section will display those.

Test: mannual tested.
Change-Id: I264fe656ff6fab42d5161100c04210ab9a94c7a0
2021-07-28 17:51:29 +00:00
Nataniel Borges
f230a13f30 [DO NOT MERGE] Full - Compatibilize winscope with master
Bug: 194813677
Test: none
Change-Id: Ie55429dcb746f597f80dfdaa68cbef19f5820005
2021-07-28 07:30:10 +00:00
Treehugger Robot
5749a89bc8 Merge changes I5801bcc3,Ib2290546 am: 1584123dbb am: 9bca36aeee am: 235a534f1b
Original change: https://android-review.googlesource.com/c/platform/development/+/1779346

Change-Id: I88595702a3dbba37e1b2f861c63bbae34aeb61b7
2021-07-27 14:42:25 +00:00
Treehugger Robot
235a534f1b Merge changes I5801bcc3,Ib2290546 am: 1584123dbb am: 9bca36aeee
Original change: https://android-review.googlesource.com/c/platform/development/+/1779346

Change-Id: I158327aac40b17d516c7a721dadd788e85ae63d9
2021-07-27 14:23:45 +00:00
Treehugger Robot
9bca36aeee Merge changes I5801bcc3,Ib2290546 am: 1584123dbb
Original change: https://android-review.googlesource.com/c/platform/development/+/1779346

Change-Id: Iead19c226245fe700bed72a07241a18c8a3f41d4
2021-07-27 14:07:10 +00:00
Treehugger Robot
1584123dbb Merge changes I5801bcc3,Ib2290546
* changes:
  Remove the look behind regex for Safari.
  Change the url to lowercase.
2021-07-27 13:50:26 +00:00
lishutong
2232234d48 Remove the look behind regex for Safari.
The lookbehind/lookahead regular expression is not supported in safari
yet. (https://caniuse.com/js-regexp-lookbehind) Removed it for
compatibility reason.

Test: manual tested.
Change-Id: I5801bcc389b20df31175adbb8a841eb1d31703aa
2021-07-27 03:40:33 +00:00
lishutong
a3c85492cc Change the url to lowercase.
Test: mannual tested.
Change-Id: Ib22905462aa47aeaa700407fe5b90e3261d0b3a3
2021-07-27 03:33:48 +00:00
Treehugger Robot
c0188deceb Merge "Add a demo page in OTA_analyzer." am: ceadd4cff1 am: 4c11f8c6e0 am: 0a461d9383
Original change: https://android-review.googlesource.com/c/platform/development/+/1778765

Change-Id: I3c5b262dc3622c0c83835dd9c9f8e73d4b1455bf
2021-07-26 21:32:55 +00:00
Treehugger Robot
0a461d9383 Merge "Add a demo page in OTA_analyzer." am: ceadd4cff1 am: 4c11f8c6e0
Original change: https://android-review.googlesource.com/c/platform/development/+/1778765

Change-Id: I258169f4a44674e835ef8b1f38dec5f2b6249dbc
2021-07-26 21:14:57 +00:00
Treehugger Robot
4c11f8c6e0 Merge "Add a demo page in OTA_analyzer." am: ceadd4cff1
Original change: https://android-review.googlesource.com/c/platform/development/+/1778765

Change-Id: I4fc5c21fe6976afcd943bce4ff408f69b4441d3e
2021-07-26 20:53:37 +00:00
Treehugger Robot
ceadd4cff1 Merge "Add a demo page in OTA_analyzer." 2021-07-26 20:39:20 +00:00
Yuntao Xu
2ab71a2936 Convert Levels/Android.mk to Android.bp
1. converted the Make file to a Soong one;
2. handled the .rscript files by genrule (to include the same commands used when build
with the former .mk file);
3. the differences observed in the apks before and after the conversion
are the same as in http://b/192521178, which should not affect the
conversion here;
4. the same result was observed when run the two apks on a physical
phone(Pixel 3a XL (bonito));
5. test commands:
mma -j LevelsRS
adb install -r ~/aosp/out/target/product/bonito/system/app/LevelsRS/LevelsRS.apk
adb shell am start -S -n com.android.rs.levels/.LevelsRSActivity
adb shell am start -S -n com.android.rs.levels/.LevelsDalvikActivity

Bug: 124261647
Test: compared the two apk files built by Make and Soong
Test: run two apks on a Pixel 3a XL (bonito) phone
Test: TreeHugger
Change-Id: I93876654215de98ec3160912676589ae143a4071
2021-07-26 19:25:52 +00:00
lishutong
cdf499330d Add a demo page in OTA_analyzer.
Please put an ota package and its target build as cf_x86_demo.zip and
cf_x86_target_file_demo into this directory: /public/files/

This OTA package and target build do not have to be complete - only the
manifest part in OTA package and .map files in target build are
necessary. The previous one can be generated using:
https://source.corp.google.com/android/vendor/google_tradefederation/contrib/src/com/google/android/tradefed/ota/util/PayloadUtil.java;l=196;bpv=1;bpt=1?q=PayloadUtil&sq=package:android
The following one can be generated by unzip and keep the .map files
only, zip again.

Add a demo page, now the user can view the complete function of
OTA_analyzer without uploading their own ota packages / android build.

Test: Mannual tested.
Change-Id: I7552e0222fc40e9a4b1aff9750f74cd3ed3f4feb
2021-07-26 17:51:51 +00:00
Treehugger Robot
e8e04e2b76 Merge "Add support for chain OTA generation." am: 4895d0a8b4 am: d5b6e875b0 am: da5830d990
Original change: https://android-review.googlesource.com/c/platform/development/+/1776605

Change-Id: If9c48597aae1d2da8f4d26668cd1ac375df6ff87
2021-07-26 17:42:07 +00:00
Treehugger Robot
da5830d990 Merge "Add support for chain OTA generation." am: 4895d0a8b4 am: d5b6e875b0
Original change: https://android-review.googlesource.com/c/platform/development/+/1776605

Change-Id: I629768bbec7e0d9f7ae4ad47c697c70ab3ab89d1
2021-07-26 17:29:50 +00:00
Treehugger Robot
d5b6e875b0 Merge "Add support for chain OTA generation." am: 4895d0a8b4
Original change: https://android-review.googlesource.com/c/platform/development/+/1776605

Change-Id: Idd6bf9445925ebb60df3cdebadb28fd873dcf50a
2021-07-26 17:12:58 +00:00
Treehugger Robot
4895d0a8b4 Merge "Add support for chain OTA generation." 2021-07-26 16:54:35 +00:00
Treehugger Robot
90f26c90c1 Merge "Add batch generation to OTAGUI." am: 2e1cfae4fd am: 2f8719ccad am: b7b945a034
Original change: https://android-review.googlesource.com/c/platform/development/+/1775726

Change-Id: I1a9e33977fb225538911cdbd49d4c7c94446401c
2021-07-23 23:24:54 +00:00