diff options
| author | Cassie Wang <cassiewang@google.com> | 2020-06-26 13:14:18 -0700 |
|---|---|---|
| committer | Cassie Wang <cassiewang@google.com> | 2020-06-26 14:29:07 -0700 |
| commit | 1db05b5d41d80b78de1acafa6f061af6dac689f2 (patch) | |
| tree | d6251802e82a3a78d9669332e22e0fadd4e80a03 /CMakeLists.txt | |
| parent | 40fad6a05f152d5207dcc1644f9b411d5ec78e39 (diff) | |
| parent | 09d66401215254a2bdfc134009039636054d28d2 (diff) | |
| download | icing-1db05b5d41d80b78de1acafa6f061af6dac689f2.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev
* aosp/upstream-master:
Pull upstream changes.
Change-Id: Ia97bfcc86c1facdfedf6984a47db254129fa11ce
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 119b086..0830783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 3.10.2) +add_definitions("-DICING_REVERSE_JNI_SEGMENTATION=1") + set( Protobuf_PREBUILTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../prebuilts/protobuf") |