Enable imaging in build_usd.py

Author: dgovil

build_scripts/build_usd.py

@@ -2234,7 +2234,7 @@ def __init__(self, args):
 
         # - Imaging
         self.buildImaging = (args.build_imaging == IMAGING or
-                             args.build_imaging == USD_IMAGING) and not embedded
+                             args.build_imaging == USD_IMAGING)
         self.enablePtex = self.buildImaging and args.enable_ptex
         self.enableOpenVDB = self.buildImaging and args.enable_openvdb
 
@@ -2251,8 +2251,8 @@ def __init__(self, args):
         self.buildPrman = self.buildImaging and args.build_prman
         self.prmanLocation = (os.path.abspath(args.prman_location)
                                if args.prman_location else None)                               
-        self.buildOIIO = args.build_oiio or (self.buildUsdImaging
-                                             and self.buildTests)
+        self.buildOIIO = (args.build_oiio or (self.buildUsdImaging
+                                             and self.buildTests))
         self.buildOCIO = args.build_ocio
 
         # - Alembic Plugin

pxr/imaging/garch/glPlatformDebugWindowDarwin.mm

@@ -226,7 +226,7 @@ - (void)keyDown:(NSEvent *)event
     [NSApp stop:nil];
 }
 
-#else
+#else // IPHONE Derivatives
 
         PXR_NAMESPACE_OPEN_SCOPE