Skip to content

Commit ebbc936

Browse files
committed
Normalize indentation and untabify script.
1 parent fb4e475 commit ebbc936

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

build_scripts/desktop/package.sh

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,25 @@ readonly deps_hidden_firebase_firestore="
176176
# List of C++ namespaces to be renamed, so as to not conflict with the
177177
# developer's own dependencies.
178178
readonly -a rename_namespaces=(flatbuffers flexbuffers reflection ZLib bssl uWS absl google
179-
base_raw_logging ConnectivityWatcher grpc
180-
grpc_access_token_credentials grpc_alts_credentials
181-
grpc_alts_server_credentials grpc_auth_context
182-
grpc_channel_credentials grpc_channel_security_connector
183-
grpc_chttp2_hpack_compressor grpc_chttp2_stream grpc_chttp2_transport
184-
grpc_client_security_context grpc_composite_call_credentials
185-
grpc_composite_channel_credentials grpc_core grpc_deadline_state
186-
grpc_google_default_channel_credentials grpc_google_iam_credentials
187-
grpc_google_refresh_token_credentials grpc_impl grpc_local_credentials
188-
grpc_local_server_credentials grpc_md_only_test_credentials
189-
grpc_message_compression_algorithm_for_level
190-
grpc_oauth2_token_fetcher_credentials grpc_plugin_credentials
191-
grpc_server_credentials grpc_server_security_connector
192-
grpc_server_security_context
193-
grpc_service_account_jwt_access_credentials grpc_ssl_credentials
194-
grpc_ssl_server_credentials grpc_tls_credential_reload_config
195-
grpc_tls_server_authorization_check_config GrpcUdpListener leveldb
196-
leveldb_filterpolicy_create_bloom leveldb_writebatch_iterate strings
197-
TlsCredentials TlsServerCredentials tsi)
179+
base_raw_logging ConnectivityWatcher grpc
180+
grpc_access_token_credentials grpc_alts_credentials
181+
grpc_alts_server_credentials grpc_auth_context
182+
grpc_channel_credentials grpc_channel_security_connector
183+
grpc_chttp2_hpack_compressor grpc_chttp2_stream grpc_chttp2_transport
184+
grpc_client_security_context grpc_composite_call_credentials
185+
grpc_composite_channel_credentials grpc_core grpc_deadline_state
186+
grpc_google_default_channel_credentials grpc_google_iam_credentials
187+
grpc_google_refresh_token_credentials grpc_impl grpc_local_credentials
188+
grpc_local_server_credentials grpc_md_only_test_credentials
189+
grpc_message_compression_algorithm_for_level
190+
grpc_oauth2_token_fetcher_credentials grpc_plugin_credentials
191+
grpc_server_credentials grpc_server_security_connector
192+
grpc_server_security_context
193+
grpc_service_account_jwt_access_credentials grpc_ssl_credentials
194+
grpc_ssl_server_credentials grpc_tls_credential_reload_config
195+
grpc_tls_server_authorization_check_config GrpcUdpListener leveldb
196+
leveldb_filterpolicy_create_bloom leveldb_writebatch_iterate strings
197+
TlsCredentials TlsServerCredentials tsi)
198198

199199
# String to prepend to all hidden symbols.
200200
readonly rename_string=f_b_
@@ -284,14 +284,14 @@ for product in ${product_list[*]}; do
284284
done
285285
done
286286
if [[ "${product}" != "app" ]]; then
287-
# For any library other than app, also rename some symbols that were already renamed in app
288-
# that are used by other libraries (e.g. zlib is used in Firestore).
289-
for dep in ${deps_hidden_firebase_app}; do
290-
for found in $(find . -path ${dep}); do
291-
if [[ ! -z ${deps_hidden} ]]; then deps_hidden+=","; fi
292-
deps_hidden+="${found}"
287+
# For any library other than app, also rename some symbols that were already renamed in app
288+
# that are used by other libraries (e.g. zlib is used in Firestore).
289+
for dep in ${deps_hidden_firebase_app}; do
290+
for found in $(find . -path ${dep}); do
291+
if [[ ! -z ${deps_hidden} ]]; then deps_hidden+=","; fi
292+
deps_hidden+="${found}"
293+
done
293294
done
294-
done
295295
fi
296296
echo -n "${libfile_out}"
297297
if [[ ! -z ${deps_basenames[*]} ]]; then
@@ -301,12 +301,12 @@ for product in ${product_list[*]}; do
301301
outfile="${full_output_path}/${libfile_out}"
302302
rm -f "${outfile}"
303303
if [[ ${verbose} -eq 1 ]]; then
304-
echo "${python_cmd}" "${merge_libraries_script}" \
305-
${merge_libraries_params[*]} \
306-
--output="${outfile}" \
307-
--scan_libs="${allfiles}" \
308-
--hide_c_symbols="${deps_hidden}" \
309-
${libfile_src} ${deps[*]}
304+
echo "${python_cmd}" "${merge_libraries_script}" \
305+
${merge_libraries_params[*]} \
306+
--output="${outfile}" \
307+
--scan_libs="${allfiles}" \
308+
--hide_c_symbols="${deps_hidden}" \
309+
${libfile_src} ${deps[*]}
310310
fi
311311
"${python_cmd}" "${merge_libraries_script}" \
312312
${merge_libraries_params[*]} \

0 commit comments

Comments
 (0)