Commit Graph

29810 Commits

Author SHA1 Message Date
Treehugger Robot
6131699aa8 Merge "Only show Presentations on suitable displays" am: a5cd725e46 am: dca9402115 am: 44801de33e am: 6c27cf24d2
Original change: https://android-review.googlesource.com/c/platform/development/+/1367119

Change-Id: Iaaafecc87bdd69e4c38353157284675d5d81ff3d
2020-07-30 16:33:05 +00:00
Treehugger Robot
6c27cf24d2 Merge "Only show Presentations on suitable displays" am: a5cd725e46 am: dca9402115 am: 44801de33e
Original change: https://android-review.googlesource.com/c/platform/development/+/1367119

Change-Id: Ibe06870a45ee3131897909ba1435308aed466a7a
2020-07-30 16:14:28 +00:00
Treehugger Robot
44801de33e Merge "Only show Presentations on suitable displays" am: a5cd725e46 am: dca9402115
Original change: https://android-review.googlesource.com/c/platform/development/+/1367119

Change-Id: I3a1f6d285e95cae93fb2225193e28f086acc3cb3
2020-07-30 15:42:31 +00:00
Treehugger Robot
dca9402115 Merge "Only show Presentations on suitable displays" am: a5cd725e46
Original change: https://android-review.googlesource.com/c/platform/development/+/1367119

Change-Id: Ia0b0be55ed30ff62e23258522ce3dc48b7fc4eaf
2020-07-30 15:24:07 +00:00
Treehugger Robot
a5cd725e46 Merge "Only show Presentations on suitable displays" 2020-07-30 15:03:55 +00:00
Linus Tufvesson
084c24eff0 Only show Presentations on suitable displays
Bug: 141745510
Test: Manually verifed, App > Activity > Presentation
Change-Id: I0ca4c18bab97f46971ae3eae29e34e74ed6a5810
2020-07-30 13:52:05 +00:00
android-build-team Robot
8ae46288c3 Snap for 6720487 from 4e373c6464 to rvc-qpr1-release
Change-Id: Ia82bbec3d5b22b3d7186d010be75ff3b7f2acb47
2020-07-29 23:01:48 +00:00
Zhomart Mukhamejanov
c0a453e84a Add generated Automotive OS SDK. am: bdb2a60d3e am: d8143b9b24 am: 4e373c6464
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I6744a194d0e23f6c590ed451e6be0d6dfe4ef6d2
2020-07-29 22:24:48 +00:00
Zhomart Mukhamejanov
4003416394 Add generated Automotive OS SDK. am: bdb2a60d3e am: 5b61ab6f97 am: b81b89ddae
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I75df1bbe0094a61acdfc102369b18626f76e0a96
2020-07-29 22:23:49 +00:00
Zhomart Mukhamejanov
216f7f2c1a Add generated Automotive OS SDK. am: bdb2a60d3e am: d8143b9b24 am: 3f2433d7a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I499a711ce684fa52170ec63d881e761931e7134d
2020-07-29 22:23:32 +00:00
Chih-Hung Hsieh
07119865a0 Add options to work in a subdirectory.
* Problem to solve:
  When cargo2android.py is run under external/crosvm,
  it does not generate .bp file in some subdirectories like kvm.
* Use --add_workspace flag to append [workspace] in Cargo.toml
  temporarily to generate correct relative source file paths.
  Otherwise, the path will be based on parent/root package
  such as external/crosvm.
* Use --global_defaults=default_name flag to insert a global
  default module name like "crosvm_defaults" in every module.
* Use --no-subdir flag to generate .bp file in one directory,
  and skip all changes to subdirectories.
* Sort the option names so they show up in order with --help.
* Use relative path for local dependent packages.
* Example: run in external/crosvm with flags;
    --run --tests --dependencies --no-subdir
  fix-up external/crosvm/Android.bp file,
  and then run in each subdirectory with flags:
    --run --tests --dependencies --add_workspace
    --global_defaults=crosvm_defaults
* Add rename mapping:
    libminijail ==> libminijail_rust

Bug: 161716839
Test: regen .bp files in external/crosvm subdirectories
Test: make && atest -m -c --include-subdirs external/crosvm
Change-Id: I0c08d358cc2f88f66e99b59032613d2a5b4ea5eb
2020-07-29 15:23:03 -07:00
Zhomart Mukhamejanov
b81b89ddae Add generated Automotive OS SDK. am: bdb2a60d3e am: 5b61ab6f97
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I6f11c257565f2c6da27f1096a1e028ff2c7cc80b
2020-07-29 22:06:45 +00:00
Zhomart Mukhamejanov
3f2433d7a6 Add generated Automotive OS SDK. am: bdb2a60d3e am: d8143b9b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I725cc6a5be912460e30e5853e6ebe6e2fb166be2
2020-07-29 22:05:55 +00:00
Zhomart Mukhamejanov
4e373c6464 Add generated Automotive OS SDK. am: bdb2a60d3e am: d8143b9b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I73ffefd8ade1faa8505c140775a5cc86219ebdee
2020-07-29 22:05:46 +00:00
Zhomart Mukhamejanov
5b61ab6f97 Add generated Automotive OS SDK. am: bdb2a60d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: Ibc767e65b6afdc4e9d8cad872ae9d6c36abf5551
2020-07-29 21:46:49 +00:00
Zhomart Mukhamejanov
d8143b9b24 Add generated Automotive OS SDK. am: bdb2a60d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: I871dd31d4c7b6fe9f2019b7e043641f830e599c2
2020-07-29 21:46:38 +00:00
Treehugger Robot
978c2a897a Merge "Fix syntax error after adding -d" am: e27e2c5448 am: 505f0a0ede am: 08baba82d6 am: c5e96c8821
Original change: https://android-review.googlesource.com/c/platform/development/+/1376576

Change-Id: Ica1a15dd0eddecdbd796696d58da479414169102
2020-07-29 21:37:31 +00:00
Treehugger Robot
c5e96c8821 Merge "Fix syntax error after adding -d" am: e27e2c5448 am: 505f0a0ede am: 08baba82d6
Original change: https://android-review.googlesource.com/c/platform/development/+/1376576

Change-Id: I6c803d35a1cb35e4fa9125674b3ec9b42fe933de
2020-07-29 21:08:53 +00:00
Treehugger Robot
08baba82d6 Merge "Fix syntax error after adding -d" am: e27e2c5448 am: 505f0a0ede
Original change: https://android-review.googlesource.com/c/platform/development/+/1376576

Change-Id: Ia41fd84965cdb672ce83c6d18be6ee2219ae2c26
2020-07-29 20:55:00 +00:00
Treehugger Robot
505f0a0ede Merge "Fix syntax error after adding -d" am: e27e2c5448
Original change: https://android-review.googlesource.com/c/platform/development/+/1376576

Change-Id: I0a168b4c1fa26c4e8b9f0375a5471fdd5704afb1
2020-07-29 20:38:48 +00:00
Zhomart Mukhamejanov
bdb2a60d3e Add generated Automotive OS SDK.
- Update old comments in sdk.atree.
- Add README.md with instructions on building sdk.

Test: lunch sdk && m -j sdk
Test: Unzipped and extracted platforms/android-11/optional/android.car.jar
      and verified it with the latest android.car-stubs.jar from
      http://ab/.
Bug: 162442020
Change-Id: I9796fbcecfef5178915008b49d81cda996c66fa2
2020-07-29 20:31:17 +00:00
Treehugger Robot
e27e2c5448 Merge "Fix syntax error after adding -d" 2020-07-29 20:18:12 +00:00
Dorin Drimus
d85d458c0b Fix syntax error after adding -d
Error when running the script is:
development/vndk/tools/build_mixed: line 289: syntax error near unexpected token `else'

Test: Locally called script with -d parameter
Bug: 161705015

Change-Id: I101bc4bf65a096cc0151171a832bda3bd78e3ce4
2020-07-29 19:20:29 +00:00
Treehugger Robot
3ae62cfe4c Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424 am: 53bb55f7f5 am: 7a26749d32 am: a94fed53a4
Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: I087edaf1ab08dc664e3ffc36d3b61f0e8b7fa6e6
2020-07-29 14:38:26 +00:00
Treehugger Robot
a94fed53a4 Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424 am: 53bb55f7f5 am: 7a26749d32
Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: I45c5e0c3c3ddc838ea6ce90a9ee0e238cfa69fe5
2020-07-29 14:21:02 +00:00
Treehugger Robot
7a26749d32 Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424 am: 53bb55f7f5
Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: Ia755560411286e4a25db30e62f6092fb6dd41faf
2020-07-29 14:01:34 +00:00
Treehugger Robot
53bb55f7f5 Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424
Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: Id3a1d5d449ef7f35d0523df37725dbd7e737e1e3
2020-07-29 13:45:51 +00:00
Treehugger Robot
40575a5424 Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" 2020-07-29 13:23:14 +00:00
Dorin Drimus
9a25b43705 Add -d parameter to mixed_build script to totally skip vbmeta.img replacement
BugId: 161705015
Change-Id: I8b95b2d463f66cb95de59e1e9b8cc6fa4b3fa8d8
Test: N/A
2020-07-29 12:14:57 +00:00
Jeongik Cha
c5d47e8b93 Use inclusive language in diff script
Test: run compare_images_and_print.sh
Bug: 162284096
Change-Id: I1f5cebbc61606a16ddfae8f64dfc57e01cbcbd3d
2020-07-29 20:31:27 +09:00
Jeongik Cha
3447456056 Use inclusive language in diff tool
Also, apply recommendation from the lint

Bug: 162284096
Test: m compare_images
Change-Id: I43a031a56aadd4b51ee309500df58348d23072aa
2020-07-29 19:57:55 +09:00
Hsin-Yi Chen
2dfbf5c87c Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1 am: 65707f3c0b am: 0a664e383b
Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: Id87259ae4722a39f1cb44cf4171ddc59b20bce68
2020-07-29 03:42:54 +00:00
Hsin-Yi Chen
0a664e383b Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1 am: 65707f3c0b
Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: If588e35058e59f27eef2218100907fc882fc8971
2020-07-29 03:27:16 +00:00
Hsin-Yi Chen
65707f3c0b Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1
Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: I9c214240aef121ea5eef6d8acaae6569f4cc6965
2020-07-29 03:07:12 +00:00
Hsin-Yi Chen
47eeb27cb1 Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9
Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: I937902b8ce8ab19ac1b277e17191fc4b71a3ce0b
2020-07-29 02:49:30 +00:00
Hsin-Yi Chen
7ee1f8e6a9 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:24:35 +00:00
Hsin-Yi Chen
e3765481a8 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: None
Change-Id: I9988f3e7dec72aa22db5b05ff4b3befec9553977
2020-07-28 19:28:48 +08:00
android-build-team Robot
de4db37f67 Snap for 6707956 from ce6e26c405 to rvc-qpr1-release
Change-Id: I2a9765fa0c17a5dbaff6e56597b2a0fe1eb523bf
2020-07-24 23:01:50 +00:00
Automerger Merge Worker
6101dcdd6d Merge "Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: d18b3d9a78 am: f5716a7624" into rvc-qpr-dev-plus-aosp 2020-07-24 21:43:41 +00:00
Zhomart Mukhamejanov
abea7bce90 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: d18b3d9a78 am: f5716a7624
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: Ia65178f709e7e5a7a496c3baa71dde8bae492b45
2020-07-24 21:43:33 +00:00
Zhomart Mukhamejanov
c713717aa4 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: 6edb7d4bfa am: ce6e26c405
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: Ia74e55ede6373ed63bc9bdceb16ed259ac41d7ad
2020-07-24 21:43:32 +00:00
Zhomart Mukhamejanov
8e679859ef Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: 6edb7d4bfa am: 9e9c29a89e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I7a0c75949417d18e362c8a6215619c9df8617c6c
2020-07-24 21:43:14 +00:00
Zhomart Mukhamejanov
f5716a7624 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: d18b3d9a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I7dc5e1ec25d63a318f727adb4307780014e86fda
2020-07-24 21:24:30 +00:00
Zhomart Mukhamejanov
ce6e26c405 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: 6edb7d4bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: Ic3213bbc3b53ce1fa863de6e4b6eb42925baeedb
2020-07-24 21:24:23 +00:00
Zhomart Mukhamejanov
9e9c29a89e Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37 am: 6edb7d4bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: Ic19c625d049bbac2cc7b1b7b8f8309af076ca097
2020-07-24 21:24:08 +00:00
Zhomart Mukhamejanov
d18b3d9a78 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I29ba637ead31f2466942c54fd26971d4fe8caed9
2020-07-24 21:07:16 +00:00
Zhomart Mukhamejanov
6edb7d4bfa Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: Ifcffe53d509946fc9c7eaf0b6d77d13fdab3eeab
2020-07-24 21:06:58 +00:00
Zhomart Mukhamejanov
683c5ffe37 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I4aa6d0cc36fd61557d94a529b9a60f8e905101bb
2020-07-24 20:54:27 +00:00
Zhomart Mukhamejanov
7737e3dc01 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I78987c8f44f88cab4d4b49534d93d3c6735c5992
2020-07-24 20:32:46 +00:00
Chih-hung Hsieh
09cbf58bce Merge "Handle -Cflag syntax and use prebuilt cargo." am: b517b4614d am: a321869ef5 am: 21480a98b1 am: 8cd4acaa36
Original change: https://android-review.googlesource.com/c/platform/development/+/1371298

Change-Id: I6d7878c1d6b55ac59c9dba48a513f0ef6fc0c995
2020-07-24 19:12:27 +00:00