Revert "Add option for eliding property metadata from messages"
This reverts commit ca3674b7d5f76299138ca635fa9c02e01e0fdf76.
While there are savings, it ends up being to easy/common to run into issues with
AppStore validation since the selector usage now appears to be a possible match
for private apis vs. for selectors/properties in the generated code.
diff --git a/objectivec/DevTools/compile_testing_protos.sh b/objectivec/DevTools/compile_testing_protos.sh
index 613c63c..69c32f9 100755
--- a/objectivec/DevTools/compile_testing_protos.sh
+++ b/objectivec/DevTools/compile_testing_protos.sh
@@ -1,6 +1,8 @@
#!/bin/bash -eu
# Invoked by the Xcode projects to build the protos needed for the unittests.
+readonly OUTPUT_DIR="${PROJECT_DERIVED_FILE_DIR}/protos"
+
# -----------------------------------------------------------------------------
# Helper for bailing.
die() {
@@ -9,27 +11,6 @@
}
# -----------------------------------------------------------------------------
-# Parameters.
-if (( $# > 1 )); then
- die "Script takes only one parameter: $#"
-fi
-
-if (( $# == 1 )); then
- case "$1" in
- "--elide_message_metadata")
- readonly ELIDE_MESSAGE_METADATA_OPTION="--objc_opt=elide_message_metadata"
- readonly OUTPUT_DIR="${PROJECT_DERIVED_FILE_DIR}/elided/protos"
- ;;
- *)
- die "Unknown option: $1"
- ;;
- esac
-else
- readonly ELIDE_MESSAGE_METADATA_OPTION=""
- readonly OUTPUT_DIR="${PROJECT_DERIVED_FILE_DIR}/normal/protos"
-fi
-
-# -----------------------------------------------------------------------------
# What to do.
case "${ACTION}" in
"")
@@ -176,7 +157,6 @@
--proto_path=src/google/protobuf/ \
--proto_path=src \
--experimental_allow_proto3_optional \
- ${ELIDE_MESSAGE_METADATA_OPTION} \
"$@"
}
