Merge pull request #1646 from tomball:master

PiperOrigin-RevId: 367049201

.gitignore

@@ -13,6 +13,9 @@ dist/
 **/xcuserdata/
 **/Translated/
 
+# Python Generated Files
+*.pyc
+
 # Mac System Files
 .DS_Store
 

make/fat_lib_macros.mk

@@ -262,12 +262,10 @@ else
 # Targets specific to a command-line build
 
 FAT_LIB_IOS_ARCHS = $(filter-out macos% maccatalyst appletv% watch%,$(J2OBJC_ARCHS))
-FAT_LIB_IPHONE_ARCHS = $(filter-out macos% maccatalyst appletv% watch% simulator%,$(J2OBJC_ARCHS))
 FAT_LIB_MAC_ARCHS = $(filter macos%,$(J2OBJC_ARCHS))
 FAT_LIB_WATCH_ARCHS = $(filter watch%,$(J2OBJC_ARCHS))
 FAT_LIB_TV_ARCHS = $(filter appletv%,$(J2OBJC_ARCHS))
 FAT_LIB_MAC_CATALYST_ARCH = $(filter maccatalyst,$(J2OBJC_ARCHS))
-FAT_LIB_SIMULATOR_ARCHS = $(filter simulator%,$(J2OBJC_ARCHS))
 
 emit_library_rules = $(foreach arch,$(J2OBJC_ARCHS),\
   $(eval $(call arch_lib_rule,$(BUILD_DIR)/objs-$(arch),$(1),$(2)))) \
@@ -277,9 +275,6 @@ emit_library_rules = $(foreach arch,$(J2OBJC_ARCHS),\
   $(if $(FAT_LIB_WATCH_ARCHS),\
     $(eval $(call watch_lib_rule,$(1),$(FAT_LIB_WATCH_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
     $(ARCH_BUILD_WATCH_DIR)/lib$(1).a,) \
-  $(if $(FAT_LIB_IPHONE_ARCHS),\
-    $(eval $(call iphone_lib_rule,$(1),$(FAT_LIB_IPHONE_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
-    $(ARCH_BUILD_IPHONE_DIR)/lib$(1).a,) \
   $(if $(FAT_LIB_MAC_ARCHS),\
     $(eval $(call mac_lib_rule,$(1),$(FAT_LIB_MAC_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
     $(ARCH_BUILD_MACOSX_DIR)/lib$(1).a,) \
@@ -288,9 +283,6 @@ emit_library_rules = $(foreach arch,$(J2OBJC_ARCHS),\
   $(if $(FAT_LIB_TV_ARCHS),\
     $(eval $(call tv_lib_rule,$(1),$(FAT_LIB_TV_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
     $(ARCH_BUILD_TV_DIR)/lib$(1).a,) \
-  $(if $(FAT_LIB_SIMULATOR_ARCHS),\
-    $(eval $(call simulator_lib_rule,$(1),$(FAT_LIB_SIMULATOR_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
-    $(ARCH_BUILD_SIMULATOR_DIR)/lib$(1).a,) \
 
 emit_arch_specific_compile_rules = $(foreach arch,$(J2OBJC_ARCHS),\
   $(call emit_compile_rules_for_arch,$(1),$(BUILD_DIR)/objs-$(arch),$(2),$(3),\

scripts/build_distribution.sh

@@ -78,7 +78,7 @@ fi
 $ENV_CMD make test_translator
 ERR=$?
 if [ ${ERR} -ne 0 ]; then
-  read -p "make test_translator failed, continue? " -n 1 -r
+  read -p "make test_translator failed, continue (y/n)?" -n 1 -r
   if [[ ! $REPLY =~ ^[Yy]$ ]]
   then
       echo "\nquitting..."