commit | 0b4a315c51613479f98b4c2741c2dba6389a750b | [log] [tgz] |
---|---|---|
author | Alexander Dorokhine <adorokhine@google.com> | Wed Mar 03 16:01:42 2021 -0800 |
committer | Alexander Dorokhine <adorokhine@google.com> | Wed Mar 03 16:02:22 2021 -0800 |
tree | 0192b1996226bb13347e07b47f70a837fb115c8a | |
parent | 533fe97b018af47301d7dc1ca3fb2e3ad5ee3eb8 [diff] |
Merge aosp upstream-master into internal upstream-master * ../../../icing-upstream-aosp/external/icing: (22 commits) Sync from upstream. Sync from upstream. Update Icing from upstream. Update Icing from upstream. Update Icing from upstream. Update Icing from upstream. Update icing from upstream. Pull upstream changes. Pull upstream changes. Pull upstream changes. Pull upstream changes. Pull upstream changes. Pull upstream changes. Update from upstream, including proto location changes. Copy over changes made to Google3 codebase in Icing. Pull upstream changes. Copy over changes made to Google3 codebase in Icing. Partial CMakeLists to compile the real icing C++ lib. Create JNI layer for Icing Add build.gradle for compiling protos for Jetpack. Change-Id: I88fa4018245b94fcec06e5dedfd45ffbbd067fe8