Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be5f83ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enable new python path behavior by default"

parents 3a56f5e0 5fe655d1

python/binary.go

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ func (binary *binaryDecorator) bootstrap(ctx android.ModuleContext, actualVersio 
		})

	}



	addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, false)

	dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, false)

	addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, true)

	dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, true)



	binFile := registerBuildActionForParFile(ctx, embeddedLauncher, launcherPath,

		binary.getHostInterpreterName(ctx, actualVersion),

python/python.go

+1 −2
Original line number Diff line number Diff line
@@ -677,8 +677,7 @@ func (p *Module) createSrcsZip(ctx android.ModuleContext, pkgPath string) androi 
		protoFlags := android.GetProtoFlags(ctx, &p.protoProperties)

		protoFlags.OutTypeFlag = "--python_out"



		// TODO(b/247578564): Change the default to true, and then eventually remove respect_pkg_path

		protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, false)

		protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, true)

		pkgPathForProtos := pkgPath

		if pkgPathForProtos != "" && protosRespectPkgPath {

			pkgPathStagingDir := android.PathForModuleGen(ctx, "protos_staged_for_pkg_path")