aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-29Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-futureHEADmastermainXin Li
Bug: 337098550 Merged-In: I5facc20e933a1f9c3b1d2a6f55f157c1b68c5184 Change-Id: Iccfa71fc1a8808789764577e57dbd482b0fd0e27
2024-01-30Merge "Enable unit tests in postsubmit" into main am: ebbe6ae8c2 am: 170c2c7751Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2935770 Change-Id: Ia124c1baab319017dd7ca13e3f738c40a9ee764a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30Merge "Enable unit tests in postsubmit" into main am: ebbe6ae8c2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2935770 Change-Id: I5facc20e933a1f9c3b1d2a6f55f157c1b68c5184 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-30Merge "Enable unit tests in postsubmit" into mainTreehugger Robot
2024-01-30Enable unit tests in postsubmitHarish Mahendrakar
The unit tests were marked as dynamic-presubmit and those are now changed to postsubmit as these tests now use DynamicConfig.xml and can download the required files without any extra arguments. After some time of running these in postsubmit, these will be changed to presubmit. Bug: 304383609 Test: atest VorbisDecoderTest Change-Id: Ibc14eac15621f1dd1a9c446aa5187c876ad6fe6b
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1 am: ↵Treehugger Robot
d25a0e0a35 am: 60ed24e5bd Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: I970c2e7b83af6b12b3ec21c419923bfea24bf1fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1 am: ↵Treehugger Robot
1dd822a6b9 am: 894634ba0c Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: If65fe0503da1fa3b7c49fe9be4b244289872e60e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1 am: ↵Treehugger Robot
d25a0e0a35 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: I385d685343e740161d529c81c3697dcf4dca4cb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1 am: ↵Treehugger Robot
1dd822a6b9 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: I66d2e0330b538d84af54f89392a92d8ba8b8d82f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: I14dc46ed4241b7027be3e78c6bf5387feafe4918 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into main am: 6681ba05f1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2469682 Change-Id: I72f60afa4f7040466d7b1cf0c4386e3f9a16364c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-18Merge "Updated fuzz_config in Android.bp file" into mainTreehugger Robot
2023-10-05Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into ↵Treehugger Robot
main am: c14f6a591e am: ab377a8756 am: 088d24d899 am: 5a749289a3 am: 06dfaf38b1 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028 Change-Id: Ia52df1ded5398c7b8abb79aea3bd51e84200034a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into ↵Treehugger Robot
main am: c14f6a591e am: ab377a8756 am: 088d24d899 am: 5a749289a3 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028 Change-Id: I1bd8994166c174b14658dde9f473ff68cc03d190 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into ↵Treehugger Robot
main am: c14f6a591e am: ab377a8756 am: 088d24d899 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028 Change-Id: Ia59142d436a64835bc8d1e22fa38695bd38f53b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into ↵Treehugger Robot
main am: c14f6a591e am: ab377a8756 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028 Change-Id: I9627ddb5deb6060549f0f39f8821eb9f37152dec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into ↵Treehugger Robot
main am: c14f6a591e Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2771028 Change-Id: I1dfaa7e46d3a9d5f9a01bc59fdecbf17739b79dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04Merge "VorbisDecoderTest: Use MediaPreparer to download test files" into mainTreehugger Robot
2023-10-04VorbisDecoderTest: Use MediaPreparer to download test filesHarish Mahendrakar
Also, use the zip file from dl.google.com path. Bug: 298733419 Test: atest VorbisDecoderTest Change-Id: Ib91f1e7528d86a40a42f1032d38e51f6de7d4cd5
2023-03-31Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵Jahin Imtiaz
64349ebdfc am: 1ae75d0d75 am: 88d5008ead am: bb00acd4f4 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: I9ffa5556ceed8dffe8c5ee125600d697d53636b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵Jahin Imtiaz
64349ebdfc am: 1ae75d0d75 am: 88d5008ead Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ia58b70190f5fb71b957f321479d0f57b24605628 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵Jahin Imtiaz
64349ebdfc am: 1ae75d0d75 am: 88d5008ead am: 39856e206f Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: I5ef5b42ae5384995d8c873127e10f7081e27f43b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseJahin Imtiaz
64349ebdfc am: 1ae75d0d75 am: 88d5008ead Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ia98a503e53e421ebdbf947d51014954a6c551214 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵android14-devJahin Imtiaz
64349ebdfc am: 1ae75d0d75 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ie1ce8520ab83f2a3f1383b86d2d61d0931a74621 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: ↵Jahin Imtiaz
64349ebdfc Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ia7fe621eebdf3c979e4db12e58601658cbf70007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30Merge "Revert "Include module dependencies under `data`"" am: fa997797bdJahin Imtiaz
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096 Change-Id: Ief2bccd362c7e43f226311759eeaae5ea074ddfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29Merge "Revert "Include module dependencies under `data`""android-u-beta-1-gplJahin Imtiaz
2023-03-28Revert "Include module dependencies under `data`"Jahin Imtiaz
This reverts commit 9c49da94f5b9fd4a82e4008fa9f980ac6a19debc. Reason for revert: media modules should use media preparers to download the media files. Change-Id: I3d7a5b3777b901df9bd851792b5319a2df46d143
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: ↵Jahin Imtiaz
f038500803 am: 432856d10e am: f767e74552 am: 561653ba88 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: Ief2e64481b06f750be3cfd26d18d5a88cbf80557 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: ↵Jahin Imtiaz
f038500803 am: 432856d10e am: f767e74552 am: 9bae5673b2 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: If5618264c8898b984867f3dde8a0091150087c5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: ↵Jahin Imtiaz
f038500803 am: 432856d10e am: f767e74552 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: Ibc1f19228e7d25ae8fc076a6f26ab0ff8440f1d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: ↵Jahin Imtiaz
f038500803 am: 432856d10e am: f767e74552 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: I57c601012575da0a9636630bf6fba7c9d533cca6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: ↵Jahin Imtiaz
f038500803 am: 432856d10e Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: I5bb1d6601ab2ff283302a8077db503ddeb7cb459 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: f038500803Jahin Imtiaz
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: I1d5e863c26fafe8076599201e29444225e88ce37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`" am: 3b7aaf64ecJahin Imtiaz
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2486444 Change-Id: I1e93ba4a1e1227c33c0bf641dff65ad966b2678b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Include module dependencies under `data`"Jahin Imtiaz
2023-03-16Include module dependencies under `data`jahinimtiaz
Bug: 269138674 Test: Presubmit Change-Id: Ifc477187d8409a285a0bb38e35315fccf0fe4905
2023-03-06Updated fuzz_config in Android.bp fileAyushi Khopkar
Added new fields in fuzz_config like - hotlists, description, vector, service_privilege, users, fuzzed_code_usage, etc. Bug: 271384401 Test: Build vorbis_dec_fuzzer Change-Id: Ida270b31f4bd639453c829f84eeafde49322ad91
2022-11-05Merge "Add riscv64 support" am: ca18fc6c5b am: bb0d9bcec3 am: 3aa769a623Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2171982 Change-Id: Id528a59e3dd1da28e59fd92c8321ae782bd86d83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05Merge "Add riscv64 support" am: ca18fc6c5b am: bb0d9bcec3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2171982 Change-Id: I8bdd78ac936f448a766dc12d90d5864eabee361c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05Merge "Add riscv64 support" am: ca18fc6c5bmain-16k-with-phonesTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2171982 Change-Id: I9232bc428d9e131cfa6e5bce0e7e0755fa973fcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04Merge "Add riscv64 support"Treehugger Robot
2022-09-09Merge "Add dependency to libbase" am: e182efa188 am: 84422ec79f am: ↵Treehugger Robot
e994146acb am: 3e4ea8cea1 am: 77f42865da Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2213277 Change-Id: I1d3c158c3995a49b767e58345070cd5ebbe68633 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Add dependency to libbase" am: e182efa188 am: 84422ec79f am: ↵Treehugger Robot
e994146acb am: 3e4ea8cea1 Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2213277 Change-Id: I6dcb101504c0358d3ff2449ed416ae0174949cff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Add dependency to libbase" am: e182efa188 am: 84422ec79f am: e994146acbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2213277 Change-Id: I07a4f4b14e0068d13708d71ae5009ea226607cc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Add dependency to libbase" am: e182efa188 am: 84422ec79fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2213277 Change-Id: Icc20ad1b5aec712ecf69dab22461bf4df15580a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Add dependency to libbase" am: e182efa188Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2213277 Change-Id: I701e707cfc503625b72cf3ad9f55fcfac0b65dc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "Add dependency to libbase"Treehugger Robot
2022-09-09Add dependency to libbaseJiyong Park
liblog now internally depends on libbase. Since part of libbase that is used by liblog is not included in liblog.a, a user of the static liblog archive should also depend on libbase. Bug: 222592894 Test: m Change-Id: I019bfb064b32f5f0657fee6135e66ca7c20f329a
2022-08-17[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e164f5f0ae ↵Xin Li
-s ours am: 148ea497d4 -s ours am: 5cccb388c4 -s ours am: 0ac5bbd619 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2186746 Change-Id: Ic695fda756bd06e9b934092b23d59b4b7dc1b90f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>