aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
Commit message (Collapse)AuthorAgeFilesLines
* Add the zero copy input stream implementations to proto lite.Joe Onorato2019-03-261-1/+1
| | | | | | | | | They aren't particularly heavy, and they are *more* efficient than the copied input stream ones that are already there. Test: make Bug: 123543706 Change-Id: Ie2b9661807d65e2fdde1481aa32bbf42206d53ae
* Mark libprotobuf-cpp-lite as double_loadableJooyung Han2019-02-081-0/+1
| | | | | | | | | | libprotobuf-cpp-lite is a VNDK lib and also used by LLNDK(libmediandk) which means this lib can be double-loaded. (deps: libmediandk -> libmedia_jni -> libmediadrm -> libprotobuf-cpp-lite) Bug: 121280180 Test: m -j Change-Id: I2b221f3064cab169c76b94f1a40722f57925fb96
* Suppress unused-const-variable warnings.Aurimas Liutikas2019-02-011-1/+1
| | | | | | | | We don't fix these warnings and upstream has them suppressed, let's not pretend we care about them. Test: make -j Change-Id: I29c91ceebd69b4bafd3f954906e91933d887202f
* Convert Android.mk file to Android.bpSasha Smundak2019-01-271-0/+76
| | | | | | | | See build/soong/README.md for more information. Change-Id: If2c8c42b8a09562dec01f5ab74faad4df99bea03 Fixes: 122332989 Test: treehugger
* Revert "Merge changes from topic "protobuf3.5.2""Colin Cross2018-11-041-81/+163
| | | | | | | | | | | | | | | | | | | | | This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d: Remove libprotobuf-java-lite Update stubs Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" Update javamicro to compile against v3.5.2 Update Android.bp to match BUILD Rerun configure Merge tag 'v3.5.2' into master Revert "Remove 2 usage of isspace as they are not stl port compatible" Revert "Use GOOGLE_CHECK Macro for validation" Revert "Emit macros with proper parentheses." Revert "Generate syntactically correct java for imports from classes with no packages." Revert "Fix some unused parameter warnings" Revert "protobuf: work around a static analyzer bug" Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning." Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
* Remove libprotobuf-java-liteColin Cross2018-11-011-71/+0
| | | | | | | | | | Java lite protos are no longer natively supported by protobuf 3.5.2. Instead, they are supported through a protoc-gen-javalite plugin and libprotobuf-java-lite runtime in external/protobuf-javalite. Bug: 117607748 Test: m checkbuild Change-Id: Icec473ebacb06af4f5b49bc2a2205f0395a19e30
* Update Android.bp to match BUILDColin Cross2018-11-011-98/+87
| | | | | | Bug: 117607748 Test: m checkbuild Change-Id: I89d3e0fafe2c1acd0a21dea16ac6aca6c833a22c
* Add recovery_available: true to libprotobuf-cpp-liteTom Cherry2018-07-241-0/+1
| | | | | | | Init needs this in order to be built in Android.bp Test: build Change-Id: Idc3bfe634e7f6cd7b1290833d6b93f3e446f574d
* Protobuf: Suppress MissingOverrideAndreas Gampe2018-06-141-0/+10
| | | | | | Bug: 73499927 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: I3947bf481b25a9ec5ecec5f3ad70200e1c130470
* Add all the internal protos to the java protobuf libJulien Desprez2018-05-181-3/+8
| | | | | | | | | | Mirror the python protobuf lib and add all the internal protos to the java lib in order to be able to use import google/protobuf/Any and such in proto definitions. Test: make host-libprotobuf-java-full Bug: 79990695 Change-Id: I3383f42b1de5cd31986cd79b6c4a82fb69fba122
* Add SIX to Python-Protobuf dependenciesNan Zhang2018-05-151-0/+3
| | | | | | Test: m -j perf_proto_stack Bug: b/79751992 Change-Id: If6b85d5378334f61648e3c85372c2143d1f683ca
* Create common protobuf libs for PythonNan Zhang2018-03-201-0/+50
| | | | | | Bug: b/70568913 Test: manually create examples. Change-Id: I63e94d6066ea4a09206b497f6181799b6e478fdc
* Don't force libcore_private.stubs to be built with java 1.7Jiyong Park2018-03-071-5/+5
| | | | | | | | | | | | | | We no longer need to build libcore_private.stubs with java 1.7, because the library is only built for target and not for host, where it conflicts with the module jdk.unsupported. Bug: 74211600 Test: m -j libprotobuf-java-lite is successful. both host and target variant of the lib is generated. Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libprotobuf-java-lite is also successful. Change-Id: I61a49d537ee6abad29e5661944ffc612a94465b8
* libcore_private.stubs is uninstallableJiyong Park2018-03-071-0/+1
| | | | | | | | | | | | Make sure that libcore_private.stubs isn't installed to the device as a standalone jar library. The lib is meant to provide build-time only symbol information to protobuf and thus is not runnable. Bug: 73204840 Test: m -j libcore_private.stubs does not create libcore_private.stubs.jar in /system/framework Change-Id: I7c661211161937dba5ee71fdc4bb8b9f101c5a59
* libcore_private.stubs cannot be built with JDK9Jiyong Park2018-03-061-0/+3
| | | | | | | | | | | | | | | The package sun.misc in the stubs library is causing module name conflict when building with JDK9. error: package exists in another module: jdk.unsupported Fixing the error by setting java_version to 1.7 so that modules are not used when building the stubs lib. Bug: 74211600 Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libcore_private.stubs Change-Id: Ifa709bef2dc8e2b11048ef96fc7517d8c25e8a7f
* Build libprotobuf-java-lite only using core Java SDK APIsJiyong Park2018-03-051-1/+12
| | | | | | | | | | | | | | | | | | | | | | | libprotobuf-java-lite is now built against core Java APIs which excludes Android-only APIs (classes under android.* packages) and private APIs. "core_current" is a pseudo SDK which is a core Java subset of Android SDK. However, this lib has been using sun.misc.Unsafe which is a hidden API and dependency to the class doesn't seem to be able to be cut easily in the near future. In order to make it possible to build the lib with the SDK only, a stubs library called libcore_private.stubs is defined to provide build-time only information on the hidden APIs exclusively to protobuf. At runtime, the Unsafe class is provide by the OS and protobuf is linked to the class loaded there. Bug: 73204840 Test: m -j libprotobuf-java-lite is successful and does not show any link-type check warning Change-Id: I2fce2662cc65d4e57fc75bbf30ebf9f7d47c6775
* Add zlib support to protobufDan Willemsen2018-02-131-73/+75
| | | | | | | | We're already including the source files for zlib support, and linking against libz, but we haven't been turning it on. Test: cd external/protobuf; mma Change-Id: Ia4d0ef9f7053b163afda7efaa7c22c3ffa32d4f7
* Move protobuf from stlport to libc++.Dan Albert2018-01-031-2/+2
| | | | | | Test: make checkbuild Bug: None Change-Id: I134b1261253ead27250c72811143929ce767931f
* Remove unused protobuf module.Dan Albert2017-12-201-15/+0
| | | | | | Test: make checkbuild Bug: None Change-Id: I6fee9f3a9bb37c92e60f71af2416363d42acf9ef
* Merge "Improve libprotoc support for plugins"Treehugger Robot2017-12-071-0/+2
|\
| * Improve libprotoc support for pluginsAndrew Scull2017-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | The protobuf documentation says "plugins written in C++ should probably build on the API in plugin.h" which offers PluginMain to call a CodeGenerator. Test: Build a protobuf plugin using PluginMain from libprotoc Merged-In: Ie08b4f3fccc8344afb67827a786ef7460d7acc62 Change-Id: Ie08b4f3fccc8344afb67827a786ef7460d7acc62
* | Add -Werror for android target.Chih-Hung Hsieh2017-11-281-0/+3
| | | | | | | | | | | | | | | | * The "android" target is not covered by "not_windows". Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I2ebdc6a132ac8f6b410a86badd58efa9ab6c088e
* | Explicit -Wno-error in external/protobufChih-Hung Hsieh2017-11-201-2/+2
| | | | | | | | | | | | | | | | | | * Some gcc warnings cannot to suppressed; use explicit -Wno-error for windows. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I4de7d6bfd896d10d1e1000f9c3b38082705067a4
* | Use -Werror in external/protobufChih-Hung Hsieh2017-10-041-0/+27
| | | | | | | | | | | | | | | | | | * Use -Wno-error= to keep existing warnings, to fix later. * Not for windows yet because some gcc warnings cannot be suppressed. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I4330ef7cd10a15259e1b8f1f9bb22bcb4fe413a5
* | Convert protobuf runtimes to Android.bpColin Cross2017-10-011-0/+129
| | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Converts the necessary runtime libraries to Soong to allow Java language modules that use protobufs to be converted to Soong. Test: m -j checkbuild Change-Id: I956e843dbe5ff95edfe09c0f9b42dfeae15aad29
* | Rename libz-host -> libzDan Willemsen2017-09-271-12/+5
| | | | | | | | | | | | | | Also remove host_ldlibs -lpthread, which is a default now. Test: m host Change-Id: Ifee46f2f2aaf158329fca207fcc9198e27926a68
* | Mark the module as VNDK or VNDK-SP in Android.bpJustin Yun2017-09-071-0/+6
|/ | | | | | | | | | | | | | | | | | As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well as 'vendor_available: true'. For a VNDK module, the 'vndk' tag has 'enabled: true'. It will be installed system/lib(64)/vndk as a vendor variant. For a VNDK-SP module, the 'vndk' tag has 'support_system_process: true' as well as 'enabled: true'. It will be installed system/lib(64)/vndk-sp as a vendor variant. Bug: 63866913 Test: build and boot with BOARD_VNDK_VERSION=current Merged-In: Ie6cc6b99dcf985014a88a405c3ced7ce405a40be Change-Id: Ie6cc6b99dcf985014a88a405c3ced7ce405a40be (cherry picked from commit 420e2eedb26129be80c4d7805ec9ad851547bc81)
* Merge "mark libprotobuf-cpp-* as VNDK" am: 06884d010c am: 7f33a820b3Jiyong Park2017-04-211-2/+6
|\ | | | | | | | | | | am: 41cc8ffd14 Change-Id: I9c77fc2660d153518dee7e056b022726ebf4defb
| * mark libprotobuf-cpp-* as VNDKJiyong Park2017-04-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | libprotobuf-cpp-*.so are now available to modules installed to vendor partition. Test: normal build successfull Test: add vendor_available:true to any module using protobuf and build with BOARD_VNDK_VERSION=current. Build is successful. Change-Id: Id96dede15c2c236026e1db44e0dc628654485e62
| * DO NOT MERGE: Revert "Merge remote-tracking branch 'goog/protobuf3' into ↵Tamas Berghammer2017-01-181-105/+13
| | | | | | | | | | | | | | | | 'goog/master'" This reverts commit f1ee8f047793dc05a7f827410b9cdd4447842380. Change-Id: Ic9caafabe69759d7031ce1236e1a0416bd57ca1d
| * Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer2016-11-161-13/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge updates protobuf from v2.6.1 to v3.0.0-beta3. Local modifications compared to upstream done during the merge: * Updated list of C++/Java sources in Android.mk * Register the Android specific java micro compiler * Migrate android specific tests to new package names * Automatically detect RTTI from compiler defined macros * Fix build when compiled with stlport Bug: b/28974522 Change-Id: I76344103ff2fa60951aa3ab3103b1bfa03742e71 (cherry picked from commit bda916c42b4fd3d235d0c49d249f03c34de77558)
* | Introduce a libprotobuf-cpp-lite_static for the hostMark Urbanus2017-01-271-0/+9
| | | | | | | | | | | | | | | | We have several host-apps that depend on a static version of libprotobuf-cpp. Bug: None Test: Validated compilation Change-Id: I232b654066833642eb8e72409b9554d2998e66d3
* | Merge "Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'"Tamas Berghammer2016-11-091-13/+105
|\ \
| * | Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'Tamas Berghammer2016-11-081-13/+105
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This merge updates protobuf from v2.6.1 to v3.0.0-beta3. Local modifications compared to upstream done during the merge: * Updated list of C++/Java sources in Android.mk * Register the Android specific java micro compiler * Migrate android specific tests to new package names * Automatically detect RTTI from compiler defined macros * Fix build when compiled with stlport Bug: b/28974522 Change-Id: I76344103ff2fa60951aa3ab3103b1bfa03742e71
* / Build libprotoc - for making plugins to protoc.Joe Onorato2016-10-121-0/+20
|/ | | | | Test: make libprotoc Change-Id: Iec3df53973f303651dbece87d7b42de6f9a7a0e8
* Convert native code to SoongDan Willemsen2016-07-311-0/+311
Soong doesn't yet support Java, so leave those parts in the Android.mk. Change-Id: Iaeefd54a05190fb5d39a6d79175b1bfeb8cc2a02
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-14 03:00:35 +0000