Migrate tuningfork protos to proto lite.
Fixed the broken protobuf_generate_lite_cpp command, and migrated tuningfork,
experimentsdemo sample and agdktunnel sample to use proto lite.
Test: Built and ran experimentsdemo and agdktunnel samples
Bug: b/274754869
Change-Id: I0e69659dd7f0c8ae645371a6210d4b5a79780981
diff --git a/games-performance-tuner/CMakeLists.txt b/games-performance-tuner/CMakeLists.txt
index e6f3709..8061840 100644
--- a/games-performance-tuner/CMakeLists.txt
+++ b/games-performance-tuner/CMakeLists.txt
@@ -33,6 +33,8 @@
${KLL_DIR}/proto/kll-quantiles.proto)
protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/proto
proto/tuningfork.proto)
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/proto
+ proto/descriptor.proto)
include_directories( . )
include_directories( ../include )
@@ -97,7 +99,8 @@
unity/unity_tuningfork.cpp
${THIRDPARTY_DIR}/json11/json11.cpp
${MODPB64_DIR}/modp_b64.cc
- ${PROTO_GENS_DIR}/lite/tuningfork.pb.cc)
+ ${PROTO_GENS_DIR}/lite/tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/descriptor.pb.cc)
set( KLL_SRCS
${KLL_DIR}/compactor_stack.cpp
@@ -109,13 +112,13 @@
${PROTO_GENS_DIR}/lite/kll-quantiles.pb.cc)
add_library( tuningfork_static
- STATIC ${TUNINGFORK_SRCS} ${KLL_SRCS} ${PROTOBUF_LITE_SRCS} ${PROTOBUF_SRCS})
+ STATIC ${TUNINGFORK_SRCS} ${KLL_SRCS} ${PROTOBUF_LITE_SRCS})
target_compile_options(tuningfork_static PUBLIC "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch" "-Wno-invalid-noreturn")
function(build_shared libname version)
add_library( ${libname}
- SHARED ${TUNINGFORK_SRCS} ${KLL_SRCS} ${PROTOBUF_LITE_SRCS} ${PROTOBUF_SRCS})
+ SHARED ${TUNINGFORK_SRCS} ${KLL_SRCS} ${PROTOBUF_LITE_SRCS})
target_compile_options(${libname} PUBLIC "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch" "-Wno-invalid-noreturn")
target_link_libraries( ${libname}
android
diff --git a/games-performance-tuner/core/protobuf_util_internal.cpp b/games-performance-tuner/core/protobuf_util_internal.cpp
index bfe29a0..12dbb3d 100644
--- a/games-performance-tuner/core/protobuf_util_internal.cpp
+++ b/games-performance-tuner/core/protobuf_util_internal.cpp
@@ -24,7 +24,7 @@
#include <map>
#include <mutex>
-#include "google/protobuf/descriptor.pb.h"
+#include "lite/descriptor.pb.h"
#include "proto/protobuf_util.h"
#include "tuningfork_utils.h"
diff --git a/games-performance-tuner/protobuf/full/CMakeLists.txt b/games-performance-tuner/protobuf/full/CMakeLists.txt
deleted file mode 100644
index 13ffc79..0000000
--- a/games-performance-tuner/protobuf/full/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.4.1)
-
-include( ../protobuf.cmake )
-
-include_directories(${PROTOBUF_SRC_DIR})
-include_directories(${PROTOBUF_SRC_DIR}/..)
-
-add_library( protobuf-static
- STATIC ${PROTOBUF_LITE_SRCS} ${PROTOBUF_SRCS}
-)
-target_compile_options(protobuf-static PUBLIC
- "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch")
-
-add_library( protobuf
- SHARED ${PROTOBUF_LITE_SRCS} ${PROTOBUF_SRCS}
-)
-target_compile_options(protobuf PUBLIC
- "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch")
-extra_pb_link_options(protobuf)
diff --git a/games-performance-tuner/protobuf/protobuf.cmake b/games-performance-tuner/protobuf/protobuf.cmake
index 74c85ac..1e98e40 100644
--- a/games-performance-tuner/protobuf/protobuf.cmake
+++ b/games-performance-tuner/protobuf/protobuf.cmake
@@ -53,7 +53,9 @@
set(_out_opt ${ARGV1})
set(_extra_opts ${ARGV2})
set(_gens_subdir ${ARGV3})
- set(_working_dir ${ARGV4})
+ set(_opt_prefix ${ARGV4})
+ set(_working_dir ${ARGV5})
+ list(REMOVE_AT ARGN 0)
list(REMOVE_AT ARGN 0)
list(REMOVE_AT ARGN 0)
list(REMOVE_AT ARGN 0)
@@ -77,7 +79,7 @@
OUTPUT "${_PROTO_GENS_DIR}${RELFIL_WE}.pb.${_extension}"
"${_PROTO_GENS_DIR}${RELFIL_WE}.pb.h"
COMMAND ${PROTOC_EXE}
- ARGS ${_out_opt}=${_PROTO_GENS_DIR}
+ ARGS ${_out_opt}=${_opt_prefix}${_PROTO_GENS_DIR}
${_extra_opts}
${_protobuf_include_path}
${REL_FIL}
@@ -96,11 +98,11 @@
function(protobuf_generate_full_cpp)
- protobuf_generate_base("cc" "--cpp_out" "" "/full" ${ARGN})
+ protobuf_generate_base("cc" "--cpp_out" "" "/full" "" ${ARGN})
endfunction()
function(protobuf_generate_lite_cpp)
- protobuf_generate_base("cc" "--cpp_out" "" "/lite" ${ARGN})
+ protobuf_generate_base("cc" "--cpp_out" "" "/lite" "lite:" ${ARGN})
endfunction()
set(GP_SRC_DIR ${PROTOBUF_SRC_DIR}/google/protobuf)
@@ -137,58 +139,4 @@
${GP_SRC_DIR}/stubs/structurally_valid.cc
${GP_SRC_DIR}/stubs/strutil.cc
${GP_SRC_DIR}/stubs/time.cc
- ${GP_SRC_DIR}/wire_format_lite.cc)
-
-set(PROTOBUF_SRCS
- ${GP_SRC_DIR}/any.cc
- ${GP_SRC_DIR}/any.pb.cc
- ${GP_SRC_DIR}/api.pb.cc
- ${GP_SRC_DIR}/compiler/importer.cc
- ${GP_SRC_DIR}/compiler/parser.cc
- ${GP_SRC_DIR}/descriptor.cc
- ${GP_SRC_DIR}/descriptor.pb.cc
- ${GP_SRC_DIR}/descriptor_database.cc
- ${GP_SRC_DIR}/duration.pb.cc
- ${GP_SRC_DIR}/dynamic_message.cc
- ${GP_SRC_DIR}/empty.pb.cc
- ${GP_SRC_DIR}/extension_set_heavy.cc
- ${GP_SRC_DIR}/field_mask.pb.cc
- ${GP_SRC_DIR}/generated_message_bases.cc
- ${GP_SRC_DIR}/generated_message_reflection.cc
- ${GP_SRC_DIR}/generated_message_tctable_full.cc
- ${GP_SRC_DIR}/io/gzip_stream.cc
- ${GP_SRC_DIR}/io/printer.cc
- ${GP_SRC_DIR}/io/tokenizer.cc
- ${GP_SRC_DIR}/map_field.cc
- ${GP_SRC_DIR}/message.cc
- ${GP_SRC_DIR}/reflection_ops.cc
- ${GP_SRC_DIR}/service.cc
- ${GP_SRC_DIR}/source_context.pb.cc
- ${GP_SRC_DIR}/struct.pb.cc
- ${GP_SRC_DIR}/stubs/substitute.cc
- ${GP_SRC_DIR}/text_format.cc
- ${GP_SRC_DIR}/timestamp.pb.cc
- ${GP_SRC_DIR}/type.pb.cc
- ${GP_SRC_DIR}/unknown_field_set.cc
- ${GP_SRC_DIR}/util/delimited_message_util.cc
- ${GP_SRC_DIR}/util/field_comparator.cc
- ${GP_SRC_DIR}/util/field_mask_util.cc
- ${GP_SRC_DIR}/util/internal/datapiece.cc
- ${GP_SRC_DIR}/util/internal/default_value_objectwriter.cc
- ${GP_SRC_DIR}/util/internal/error_listener.cc
- ${GP_SRC_DIR}/util/internal/field_mask_utility.cc
- ${GP_SRC_DIR}/util/internal/json_escaping.cc
- ${GP_SRC_DIR}/util/internal/json_objectwriter.cc
- ${GP_SRC_DIR}/util/internal/json_stream_parser.cc
- ${GP_SRC_DIR}/util/internal/object_writer.cc
- ${GP_SRC_DIR}/util/internal/proto_writer.cc
- ${GP_SRC_DIR}/util/internal/protostream_objectsource.cc
- ${GP_SRC_DIR}/util/internal/protostream_objectwriter.cc
- ${GP_SRC_DIR}/util/internal/type_info.cc
- ${GP_SRC_DIR}/util/internal/utility.cc
- ${GP_SRC_DIR}/util/json_util.cc
- ${GP_SRC_DIR}/util/message_differencer.cc
- ${GP_SRC_DIR}/util/time_util.cc
- ${GP_SRC_DIR}/util/type_resolver_util.cc
- ${GP_SRC_DIR}/wire_format.cc
- ${GP_SRC_DIR}/wrappers.pb.cc)
\ No newline at end of file
+ ${GP_SRC_DIR}/wire_format_lite.cc)
\ No newline at end of file
diff --git a/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt b/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
index b54f30b..1c67bb3 100644
--- a/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
+++ b/samples/agdktunnel/app/src/main/cpp/CMakeLists.txt
@@ -34,8 +34,8 @@
include_directories("${GAMESDK_BASE_DIR}/samples/tuningfork/common")
if("${USE_APT}" STREQUAL "true")
# generate runtime files using protoc
- protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/../proto ../proto/dev_tuningfork.proto)
- protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/../proto ../proto/tuningfork.proto)
+ protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/../proto ../proto/dev_tuningfork.proto)
+ protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/../proto ../proto/tuningfork.proto)
include_directories(${PROTO_GENS_DIR})
endif()
@@ -65,8 +65,8 @@
if("${USE_APT}" STREQUAL "true")
set(PROTOGEN_SRCS
- ${PROTO_GENS_DIR}/full/dev_tuningfork.pb.cc
- ${PROTO_GENS_DIR}/full/tuningfork.pb.cc)
+ ${PROTO_GENS_DIR}/lite/dev_tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/tuningfork.pb.cc)
else()
set(PROTOGEN_SRCS "")
endif()
diff --git a/samples/agdktunnel/app/src/main/cpp/tuning_manager.hpp b/samples/agdktunnel/app/src/main/cpp/tuning_manager.hpp
index 0f8f899..d619ef0 100644
--- a/samples/agdktunnel/app/src/main/cpp/tuning_manager.hpp
+++ b/samples/agdktunnel/app/src/main/cpp/tuning_manager.hpp
@@ -21,8 +21,8 @@
#if defined(USE_APT)
// Generated protobuf headers
-#include "full/dev_tuningfork.pb.h"
-#include "full/tuningfork.pb.h"
+#include "lite/dev_tuningfork.pb.h"
+#include "lite/tuningfork.pb.h"
#endif
struct AConfiguration;
diff --git a/samples/tuningfork/experimentsdemo/app/CMakeLists.txt b/samples/tuningfork/experimentsdemo/app/CMakeLists.txt
index d030ae5..961d4d7 100644
--- a/samples/tuningfork/experimentsdemo/app/CMakeLists.txt
+++ b/samples/tuningfork/experimentsdemo/app/CMakeLists.txt
@@ -19,8 +19,8 @@
include("../../../../games-performance-tuner/protobuf/protobuf.cmake")
-protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/dev_tuningfork.proto)
-protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/tuningfork.proto)
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/dev_tuningfork.proto)
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/tuningfork.proto)
include_directories(${PROTO_GENS_DIR})
include_directories(${PROTOBUF_SRC_DIR})
include_directories(${PROTOBUF_SRC_DIR}/../config/)
@@ -32,7 +32,6 @@
add_library( protobuf-static
STATIC
${PROTOBUF_LITE_SRCS}
- ${PROTOBUF_SRCS}
)
target_compile_options(protobuf-static PUBLIC "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch" "-Wno-invalid-noreturn")
@@ -41,8 +40,8 @@
src/main/cpp/experimentsdemo.cpp
../../common/Renderer.cpp
../../common/Scene.cpp
- ${PROTO_GENS_DIR}/full/dev_tuningfork.pb.cc
- ${PROTO_GENS_DIR}/full/tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/dev_tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/tuningfork.pb.cc
)
target_link_libraries( ${CMAKE_PROJECT_NAME}
diff --git a/samples/tuningfork/experimentsdemo/app/src/main/cpp/experimentsdemo.cpp b/samples/tuningfork/experimentsdemo/app/src/main/cpp/experimentsdemo.cpp
index 46db5e7..08cc5b9 100644
--- a/samples/tuningfork/experimentsdemo/app/src/main/cpp/experimentsdemo.cpp
+++ b/samples/tuningfork/experimentsdemo/app/src/main/cpp/experimentsdemo.cpp
@@ -15,8 +15,8 @@
#include "tuningfork/tuningfork.h"
#include "swappy/swappyGL.h"
#include "swappy/swappyGL_extra.h"
-#include "full/tuningfork.pb.h"
-#include "full/dev_tuningfork.pb.h"
+#include "lite/tuningfork.pb.h"
+#include "lite/dev_tuningfork.pb.h"
#include "protobuf_util.h"
#include <sstream>
#include <condition_variable>
@@ -97,8 +97,6 @@
p.set_tesselation_percent(50);
std::vector<uint8_t> params_ser(params->bytes, params->bytes + params->size);
tf::Deserialize(params_ser, p);
- std::string s = p.DebugString();
- ALOGI("Using FidelityParams: %s", ReplaceReturns(s).c_str());
int nSpheres = p.num_spheres();
int tesselation = p.tesselation_percent();
Renderer::getInstance()->setQuality(nSpheres, tesselation);
diff --git a/samples/tuningfork/insightsdemo/app/CMakeLists.txt b/samples/tuningfork/insightsdemo/app/CMakeLists.txt
index 9c9dacb..7857a66 100644
--- a/samples/tuningfork/insightsdemo/app/CMakeLists.txt
+++ b/samples/tuningfork/insightsdemo/app/CMakeLists.txt
@@ -20,8 +20,8 @@
include("../../../../games-performance-tuner/protobuf/protobuf.cmake")
-protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/dev_tuningfork.proto)
-protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/tuningfork.proto)
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/dev_tuningfork.proto)
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/src/main/proto src/main/proto/tuningfork.proto)
include_directories(${PROTO_GENS_DIR})
include_directories(${PROTOBUF_SRC_DIR})
include_directories(${PROTOBUF_SRC_DIR}/../config/)
@@ -29,11 +29,9 @@
include_directories(../../../common/include)
include_directories(../../../../include)
-# Note that we use the FULL version of protobuf in the testapp, so we can get debug strings
add_library( protobuf-static
STATIC
${PROTOBUF_LITE_SRCS}
- ${PROTOBUF_SRCS}
)
target_compile_options(protobuf-static PUBLIC "-Wno-tautological-constant-compare" "-Wno-enum-compare-switch" "-Wno-invalid-noreturn")
@@ -43,8 +41,8 @@
../../common/Renderer.cpp
../../common/Scene.cpp
../../common/protobuf_util.cpp
- ${PROTO_GENS_DIR}/full/dev_tuningfork.pb.cc
- ${PROTO_GENS_DIR}/full/tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/dev_tuningfork.pb.cc
+ ${PROTO_GENS_DIR}/lite/tuningfork.pb.cc
)
target_link_libraries( ${CMAKE_PROJECT_NAME}
diff --git a/samples/tuningfork/insightsdemo/app/src/main/cpp/insightsdemo.cpp b/samples/tuningfork/insightsdemo/app/src/main/cpp/insightsdemo.cpp
index 4eef534..871e9ba 100644
--- a/samples/tuningfork/insightsdemo/app/src/main/cpp/insightsdemo.cpp
+++ b/samples/tuningfork/insightsdemo/app/src/main/cpp/insightsdemo.cpp
@@ -17,8 +17,8 @@
#include "protobuf_util.h"
#include "swappy/swappyGL.h"
#include "swappy/swappyGL_extra.h"
-#include "full/tuningfork.pb.h"
-#include "full/dev_tuningfork.pb.h"
+#include "lite/tuningfork.pb.h"
+#include "lite/dev_tuningfork.pb.h"
#include <sstream>
#include <condition_variable>
#include <jni.h>
diff --git a/test/tuningfork/CMakeLists.txt b/test/tuningfork/CMakeLists.txt
index e02697f..694fc93 100644
--- a/test/tuningfork/CMakeLists.txt
+++ b/test/tuningfork/CMakeLists.txt
@@ -37,7 +37,7 @@
# Save the generation dir as it gets overwritten when we add_subdirectory tuningfork
set(PGENS_DIR "${PROTO_GENS_DIR}")
-protobuf_generate_full_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/proto
+protobuf_generate_lite_cpp( ${CMAKE_CURRENT_SOURCE_DIR}/proto
proto/tuningfork.proto
proto/dev_tuningfork.proto
)
@@ -79,8 +79,8 @@
serialization_test.cpp
settings_test.cpp
../common/test_utils.cpp
- ${PGENS_DIR}/full/dev_tuningfork.pb.cc
- ${PGENS_DIR}/full/tuningfork.pb.cc
+ ${PGENS_DIR}/lite/dev_tuningfork.pb.cc
+ ${PGENS_DIR}/lite/tuningfork.pb.cc
)
add_executable(tuningfork_test
@@ -96,7 +96,7 @@
)
add_library( protobuf-static
- STATIC ${PROTOBUF_LITE_SRCS} ${PROTOBUF_SRCS}
+ STATIC ${PROTOBUF_LITE_SRCS}
)
target_compile_options(protobuf-static PUBLIC "-Wno-tautological-constant-compare"
"-Wno-enum-compare-switch"
diff --git a/test/tuningfork/endtoend/common.h b/test/tuningfork/endtoend/common.h
index 8526b2d..a4ccc97 100644
--- a/test/tuningfork/endtoend/common.h
+++ b/test/tuningfork/endtoend/common.h
@@ -22,10 +22,10 @@
#include "core/memory_telemetry.h"
#include "core/tuningfork_internal.h"
-#include "full/dev_tuningfork.pb.h"
-#include "full/tuningfork.pb.h"
#include "gtest/gtest.h"
#include "http_backend/http_backend.h"
+#include "lite/dev_tuningfork.pb.h"
+#include "lite/tuningfork.pb.h"
#include "proto/protobuf_util.h"
#ifndef LOG_TAG
diff --git a/test/tuningfork/settings_test.cpp b/test/tuningfork/settings_test.cpp
index c88de7f..e882d98 100644
--- a/test/tuningfork/settings_test.cpp
+++ b/test/tuningfork/settings_test.cpp
@@ -18,7 +18,7 @@
#include <gtest/gtest.h>
-#include "full/tuningfork.pb.h"
+#include "lite/tuningfork.pb.h"
using namespace com::google::tuningfork;
