Commit Graph

30090 Commits

Author SHA1 Message Date
Treehugger Robot
a0bb9f649b Merge "Stop relying on /usr/bin/python for SDK builds" am: f5f2b3bfaa
Original change: https://android-review.googlesource.com/c/platform/development/+/1788908

Change-Id: I9629efc1960c55334117e2e822025bce6ea5e0a3
2021-08-06 17:44:30 +00:00
Treehugger Robot
f5f2b3bfaa Merge "Stop relying on /usr/bin/python for SDK builds" 2021-08-06 17:28:31 +00:00
Dan Willemsen
7a0a133eba Stop relying on /usr/bin/python for SDK builds
Instead, use python2 from $PATH, which will be a prebuilt inside the
build system.

Test: treehugger
Change-Id: I81966e85377c8e9dd87e1f2656f6c0ec6b3a636c
2021-08-05 17:14:01 -07:00
Kiyoung Kim
51b5b225ee Merge "Allow relative path as 'local' argument" am: d29c0d62e3
Original change: https://android-review.googlesource.com/c/platform/development/+/1784373

Change-Id: I3d8f8f644250073dff5a7d0c65adbdb5da6ea469
2021-08-04 07:03:12 +00:00
Kiyoung Kim
d29c0d62e3 Merge "Allow relative path as 'local' argument" 2021-08-04 06:53:00 +00:00
Kiyoung Kim
80db1a0f7c Allow relative path as 'local' argument
Currently local argument only allows absolute path, and there is no
proper error message when relative path is used. This change updates
local argument to absolute path, so relative path can be used as the
value.

Test: update.py with relative local path succeeded
Change-Id: If6f816849bb0ee6673a95e823227f6201fb7c086
2021-08-04 13:58:21 +09:00
Ivan Lozano
f22aa67f98 Merge "Specify branch in the add3prf.py generated OWNERS" am: 9556508ef2
Original change: https://android-review.googlesource.com/c/platform/development/+/1783149

Change-Id: I44c440e95e00637a612cb4cf2dc44172968bb01c
2021-08-03 18:34:50 +00:00
Ivan Lozano
9556508ef2 Merge "Specify branch in the add3prf.py generated OWNERS" 2021-08-03 18:15:10 +00:00
Ivan Lozano
70c12c514e Specify branch in the add3prf.py generated OWNERS
The branch needs to be specified in our generated OWNERS file or some
tooling will fail to find the correct OWNERS file.

Bug: 191797059
Test: New OWNERS file works as expected.
Change-Id: I91f2af6c5f489daee859b66ae0bd3c19a0bc0a3b
2021-07-30 14:39:04 -04:00
Kelvin Zhang
d2f6d63acd Merge "Support docker for ota generator" am: 091a8fb955
Original change: https://android-review.googlesource.com/c/platform/development/+/1780768

Change-Id: I0b234156722531294b6b6ddbd467c62f9db57ade
2021-07-29 13:10:17 +00:00
Kelvin Zhang
091a8fb955 Merge "Support docker for ota generator" 2021-07-29 12:54:42 +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
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
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
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
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
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
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
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
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
2f8719ccad Merge "Add batch generation to OTAGUI." am: 2e1cfae4fd
Original change: https://android-review.googlesource.com/c/platform/development/+/1775726

Change-Id: I230b943a2c54de6b052ee0de26ed73238ef7533f
2021-07-23 22:47:47 +00:00
Treehugger Robot
2e1cfae4fd Merge "Add batch generation to OTAGUI." 2021-07-23 22:17:19 +00:00
lishutong
bb3bc961d4 Add support for chain OTA generation.
To upgrade from the Android version A to Android version D, one could
directly generate an OTA package from A to D. But chances are (a) this
OTA package can be large and unstable (b) there are multiple other
devices are on version B or C. So generation of chain OTA packages
(A-->B-->C-->D) can help life easier.

Users will be able to select and sort the Android build in
`ChainOTAOptions.vue` component, and submit multiple jobs at the same
time using a OTAConfiguration from `JobSubmission.js`.

Test: Mannual tested.
Change-Id: I9f16f981af80900c18a571162146ce218ea96387
2021-07-23 19:52:28 +00:00
lishutong
c4b6c3a7dd Add batch generation to OTAGUI.
Batch generation of OTA packages is a important feature
requested by googler and partners: please refer to go/ota-dashboard-doc.
Given n incremental source builds and m target builds,
batch generation will generate n x m OTA packages in total.
If n=0, full OTA package will be generated.

The front end will be taking in the source/target lists and send the
request to backend one-by-one.

Test: mannual tested.

Change-Id: I769359ee69c7aa8c71704c4e119c374635554dfb
2021-07-23 19:18:52 +00:00
Yuntao Xu
1185764fe4 Merge "Convert HelloCompute/Android.mk to Android.bp" am: 287e52bff6
Original change: https://android-review.googlesource.com/c/platform/development/+/1711177

Change-Id: Iedc1db6dab9081f7c3ba2896de1c058785e7f885
2021-07-23 18:18:02 +00:00
Yuntao Xu
287e52bff6 Merge "Convert HelloCompute/Android.mk to Android.bp" 2021-07-23 17:47:36 +00:00
Treehugger Robot
8f08ab906f Merge "Refactor the frontend for batch generation." am: 89e47defef
Original change: https://android-review.googlesource.com/c/platform/development/+/1775725

Change-Id: I0e9ccb6d87ced9b6bdf2d0f0035bbeb18a45ea29
2021-07-23 17:30:24 +00:00
Treehugger Robot
89e47defef Merge "Refactor the frontend for batch generation." 2021-07-23 16:49:11 +00:00
lishutong
aaf2c7a933 Refactor the frontend for batch generation.
Following part has been modified:

1. Add tabs for selection between single generation and batch
generation. (src/components/JobConfigure.vue)

2. Change the data structure of OTAConfiguration, now it only records
the flags. The source/target build will be provided when submit jobs.
(src/services/JobSubmission.js)

3. Seperate the OTAOptions as a single component, which only takes in
the flags for backend. The selection of source/target build will be in a
seperate component. (src/components/OTAOptions.vue,
src/components/SingleOTAOptions.vue).

4. Now the partition selection can takes in more than one build, but
only show the partition list of first one. Later on, this will be able
to show the intersection of the partition lists from all given builds.
(src/components/PartialCheckbox.vue)

Point 1 enables the possibility of the dynamical loading of single/batch
ota generation pages. Point 2,3,4 allow the OTAOptions components to
be reused for batch generation.

Test: Mannual tested.
Change-Id: I1a29fa7c605596d717d19da25d31b81ce5b8fcba
2021-07-23 15:09:31 +00:00
Yuntao Xu
4945a032a0 Convert HelloCompute/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/186244109, 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 RsHelloCompute
adb install -r ~/aosp/out/target/product/bonito/system/app/RsHelloCompute/RsHelloCompute.apk
adb shell am start -S -n com.example.android.rs.hellocompute/.HelloCompute

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: I93a536ccedd9abe5ceb99d73d96668f0a861fb51
2021-07-22 16:25:28 -07:00