aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-19Add denpendencies to AppSearch CmakeLists.txt commands. To allow it re-make ↵androidx-biometric-releaseandroidx-autofill-releaseTerry Wang
when file is updated. Bug: 170611579 Test: Manually: 1: checkout on an old branch 2. add denpendencies to cmake (changing cmakelists will invalidate a lot of caches) 3. build and generate cxx files 4. patch the head branch with the latest version 5. build again w/o any error. Change-Id: Ie47826cb74a84160ef0646abbfd77869801f2c35
2020-10-09Merge "Merge remote-tracking branch 'aosp/upstream-master' into ↵androidx-print-releaseTerry Wang
androidx-master-dev" into androidx-master-dev
2020-10-02Merge remote-tracking branch 'aosp/upstream-master' intoTerry Wang
androidx-master-dev * aosp/upstream-master: Pull upstream changes. Pull upstream changes. Change-Id: I5b2c3472b2419ea7c1b005bb06b1678a2f873df7
2020-10-01Pull upstream changes.Terry Wang
Change-Id: I794757716961569b5c02171cfc82785efb2cf106
2020-10-01Upgrade to protobuf gradle plugin 0.8.13Aurimas Liutikas
This version is needed to better support Gradle configuration caching. https://github.com/google/protobuf-gradle-plugin/releases/tag/v0.8.13 Test: ./gradlew assembleDebug Change-Id: I1d7793e75f7d68493fa7e6adccad630a439f744c
2020-09-24Pull upstream changes.Terry Wang
Change-Id: I44831fdadcdb67f2e19570a35cb4c76faf8397f9
2020-08-14Strip .proto files from appsearch proto-lite dependency using jar taskandroidx-media2-media2-widget-releaseandroidx-exifinterface-releaseRohit Sathyanarayana
The datastore sample app fails to build with a direct proto lite dependency and dependency on appsearch because these .proto files are duplicated but unecessary. See failure here: aosp/1394341 Bug: 163897667 Test: Built DataStore sample app. I've added a test in a follow up cl here: aosp/1399613 Relnote: Fixing dependency issue Change-Id: If68a7a5dc1369baa552140feff0913de64cba98d
2020-07-28Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devTerry Wang
* aosp/upstream-master: Pull upstream changes. Change-Id: I2b23aaf8859b5c0b201a69ae3cbcaa6acd49c6bd
2020-07-28Pull upstream changes.Terry Wang
Change-Id: Iaff79337219850eb1bbede8fc1738f3051e9005e
2020-07-24Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devCassie Wang
* aosp/upstream-master: Pull upstream changes. Change-Id: I1dfaf946045f9b00d1f560a1b9e71ea16938c4d0
2020-07-24Pull upstream changes.Cassie Wang
Change-Id: Ieed20fd00a7c00778045434ae1b7c9e019a6c369
2020-07-14Move compilation of libicing.so into appsearch:appsearch.Alexander Dorokhine
We haven't been able to get an externally built libicing.so properly included into appsearch-release.aar any other way yet (b/161205849). Since nothing in external/icing is being uploaded to maven or snapshotted into g3, the native lib is not available to dogfood. Bug: 161205849 Test: Manual inspection of appsearch-release.aar Change-Id: I76ac2beb59b2ed7f3e0a2e8710df690e366102c0
2020-07-13Move icing lib build.gradle to root of repo.Alexander Dorokhine
This was requested because it was confusing Android Studio. Test: Presubmit Change-Id: I5fa7a56867f113a944ad52a803096b0b068573e4
2020-07-13Build the external/icing project in a self-contained manner.Alexander Dorokhine
The jarjar+android lib implementation is based on camera2-pipe. This CL switches us away from AndroidXPlugin because that plugin enforces API tracking, visibility restrictions and specific lints which don't apply to an external project not exposed to 3p developers. Bug: 160643524 Test: Presubmit Change-Id: I46ac22bb600954e00b81287ce53bc86fa987c67b
2020-07-06Hide classes from public API surface.Cassie Wang
Bug: 159041257 Test: ./gradlew appsearch:appsearch:connectedCheck --info --daemon Change-Id: I08a48f998e042db62e4ed355f9a81b7668a53749
2020-06-26Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devCassie Wang
* aosp/upstream-master: Pull upstream changes. Change-Id: Ia97bfcc86c1facdfedf6984a47db254129fa11ce
2020-06-25Pull upstream changes.Cassie Wang
Change-Id: I8a1e76e3e42188364ac40c0c51efb1e49292c015
2020-06-09Uncomment CMakeLists.txt to start building icing native lib.Alexander Dorokhine
Bug: 149853706 Test: Presubmit Change-Id: If58d6ebbe4645e779c0b4f4618fb154d09609df3
2020-06-09Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devAlexander Dorokhine
* aosp/upstream-master: Update from upstream, including proto location changes. Bug: 158587690 Change-Id: Ib6134a09fa8832e980daa3c795775a32a8430c30
2020-06-09Update from upstream, including proto location changes.Alexander Dorokhine
Bug: 158587690 Change-Id: Ie20d5515288cf3a1bdbc19ff5ec62f936456e85d
2020-06-05Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devTim Barron
* aosp/upstream-master: Copy over changes made to Google3 codebase in Icing. Change-Id: I96bfd7e1352922d32314faaf1c00717afc95569c
2020-06-05Copy over changes made to Google3 codebase in Icing.Tim Barron
Change-Id: Ia36edb0a1b085e249dabfc220a5b72418063604f
2020-06-03Update CMakeLists.txt to use precompiled protoc.Alexander Dorokhine
We are not set up for building host binaries so this was non-hermetic and did not work properly on the buildbots which did not have a preinstalled host toolchain. Bug: 157512302 Test: Presubmit Change-Id: I23f2e224d876a8c60336e775dfbcd115cd014a50
2020-05-14Modify external/icing CMake to build against libandroidicu.Tim Barron
This resolves compiler/linker issues with building external/icing against icu. Change-Id: I6fce71df9dd65c062273d73fc5b1b188ecea9ffc
2020-05-05Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-devCassie Wang
* aosp/upstream-master: Pull upstream changes. Change-Id: I3cf59e36b1cf1bfe5093d962c477e4d02e84aaea
2020-05-04Pull upstream changes.Cassie Wang
Change-Id: I28e569082d59404e23e554a9aa7d8751328009e8
2020-04-26Use add_custom_command instead of execute_process for building protos.Alexander Dorokhine
This more closely matches how CMake is supposed to be used. It adds the commands as build steps instead of running them as part of analyzing the build script itself. This allows the build steps to be parallelized, produce output in the correct place, and run only when libicing is actually being built. Bug: 149853706 Test: ./gradlew external:icing:assemble Change-Id: I548cf82d5d5ed6377fd65fa8f5ed04e90bd0d4f8
2020-04-10Merge "Implement jarjar for icing protos." into androidx-master-devAlexander Dorokhine
2020-04-09Merge "Split icing project into two parts: protos/java, and native lib." ↵Alexander Dorokhine
into androidx-master-dev
2020-04-06Implement jarjar for icing protos.Alexander Dorokhine
This is required to avoid the diamond dependency problem for users of our lib who also use a separate version of protobuf. This implementation of jarjar is based on the jarjar of flatbuffers for emoji-compat. Bug: 153380375 Test: ./gradlew appsearch:appsearch:connectedCheck --daemon --info Change-Id: I8495b0a0a70d6e2c5f16683895d3b1879de610ec
2020-04-06Split icing project into two parts: protos/java, and native lib.Alexander Dorokhine
The native lib will only be required for clients who choose not to use the other backends, so it should be kept separate. This also enables us to jarjar and proguard the protos/java side more easily. Bug: 153380375 Test: ./gradlew appsearch:appsearch:connectedCheck --daemon --info Change-Id: I96a7b91c4b29cd8d620498e66393334c64afcd03
2020-03-27Modify external/icing CMake to link against libprotobuf.androidx-swiperefreshlayout-releaseandroidx-emoji-releaseandroidx-customview-releaseAlexander Dorokhine
The next issue is resolving linker errors with libicushim. Bug: 149853706 Change-Id: I16dafc7e4e54147ff04746a711c8639580bbe567
2020-03-24Merge remote-tracking branch 'aosp/upstream-master' into ↵Tim Barron
androidx-master-dev. This will merge changes made to external/icing in google3. * aosp/upstream-master: Copy over changes made to Google3 codebase in Icing. Change-Id: I96154d234987476fa2d3b870a880b318900e62b7
2020-03-23Copy over changes made to Google3 codebase in Icing.Tim Barron
Change-Id: Ic4e7a964ced111738cca80e078b3e03759c19ccf
2020-03-04Merge "Create JNI layer for Icing" into androidx-master-devTreehugger Robot
2020-03-02Partial CMakeLists to compile the real icing C++ lib.Alexander Dorokhine
Limitations: * Currently using execute_process instead of add_custom_command, which causes protobuf compilation to occur during configure. We need to build protoc on the host, so trying to use add_custom_command to do it during the target build is complicated. * Invoking protoc directly instead of using FindProtobuf and protobuf_generate_cpp. I was able to get FindProtobuf to work with the external/protobuf source tree, but I can't get protobuf_generate_cpp to put the generated protos in the right place. * Icing lib is missing utf dependencies, so this does not currently compile. * No work has been done on the link step; we'll have to find a way to compile libprotobuf-lite for the target and depend on it. Test: ./gradlew icing:assemble Bug: 149853706 Change-Id: I0568efe23f255b1fca463891ebd816aca5979841
2020-02-28Create JNI layer for IcingCassie Wang
Bug: 146383629 Test: manual 'atest java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java' Change-Id: I3868ca19a477bd6996f268d2a73a1dc906afaee6
2020-02-18Add build.gradle for compiling protos for Jetpack.Alexander Dorokhine
Bug: 149427674 Bug: 149787478 Test: ./gradlew appsearch:appsearch:connectedCheck --info --daemon Change-Id: I939b5dbecf5b0fde04a0762ac942162fc02b40d0
2020-01-16Merge branch 'upstream-master'Cassie Wang
* upstream-master: Pull upstream changes. Bug: 146383629 Bug: 143789408 Test: manual 'm -j libicing' Change-Id: Iaf6e1651711c689a55e08fcdc011a052ef5f7bd7
2020-01-16Pull upstream changes.Cassie Wang
Upstream synced @290094995 Bug: 146383629 Test: manual, ran 'm -j libicing' with a local Android.bp Change-Id: I63eb12e93f3de5d6607ba7006fd3ea532dc079e4
2020-01-14Modify Android.bp to compile c++ code.Cassie Wang
Bug: 146383629 Test: manual - ran 'm -j libicing' Change-Id: I0be3d1e088f0f2e07f027c4f66a7ed27f6d6f880
2020-01-09Merge branch 'upstream-master'Cassie Wang
* upstream-master: Pull upstream changes and copy libtextclassifier classes. Port over Icing c++ code from upstream Bug: 146383629 Test: manual - ran 'm -j libicing' with a local Android.bp Test: presubmit Change-Id: I6e9af83a5e09c1401379ecc8009bd00a32f210f3
2020-01-09Pull upstream changes and copy libtextclassifier classes.Cassie Wang
Upstream synced @288789500. Copied text_classifier dependencies (hash, status, logging) into icing/. Bug: 146383629 Test: manual - ran 'm -j libicing' with a working Android.bp locally Change-Id: I187a98af95b362745a09d605ed8334a6ff6971bb
2019-12-20Port over Icing c++ code from upstreamCassie Wang
Change-Id: Ia3981fed7e0e70589efc027d4123f306cdfbe990
2019-11-27Create an Android.bp file to compile Icing protos.Alexander Dorokhine
Test: Manual Bug: 145010258 Change-Id: I8bb96309b6bc9657ef31e7a7cd0625a79ccfe399
2019-11-27Merge branch 'upstream-master'Alexander Dorokhine
* upstream-master: Update Icing protos from piper upstream. Switch external/icing/ from github to piper. Bug: 145010258 Test: presubmit Change-Id: I710a95aaaeeb9f37a331ebc023cc18f4bfdbe24c
2019-11-26Update Icing protos from piper upstream.Alexander Dorokhine
Change-Id: If0117363362baedc564e4c128b6d0a1009ace9b4
2019-11-25Switch external/icing/ from github to piper.Alexander Dorokhine
Suggested per http://g/android-new-project-reviewers/EY_i7nDUE88/C85jhLDEAQAJ. Bug: 145010258 Change-Id: I18e92f677dcbc69198a50974a40691de8bd297b6
2019-11-22Merge branch 'upstream-master'Alexander Dorokhine
2019-11-22Import platform/external/icingAlexander Dorokhine
source_repository_url: "user/adorokhine/icing-search-ag" source_branch: "staging" source_tip_commit: "67ceaa1d6b6d7da5fa5ed3512ada340c2060250e" target_repository_name: "platform/external/icing" Bug: 145010258 Change-Id: I948c0d7979563d688ba08c13614ab6a54ad3a7ff
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 10:17:58 +0000