diff --git a/cc/library_stub.go b/cc/library_stub.go
index 1b02330..760d36a 100644
--- a/cc/library_stub.go
+++ b/cc/library_stub.go
@@ -106,7 +106,6 @@
 	d.libraryDecorator.reexportFlags(deps.ReexportedFlags...)
 	d.libraryDecorator.reexportDeps(deps.ReexportedDeps...)
 	d.libraryDecorator.addExportedGeneratedHeaders(deps.ReexportedGeneratedHeaders...)
-	d.libraryDecorator.flagExporter.setProvider(ctx)
 
 	if d.properties.Src == nil {
 		ctx.PropertyErrorf("src", "src is a required property")
@@ -116,6 +115,12 @@
 	// Build orchestrator will be responsible for creating a connected ninja graph.
 	in := android.MaybeExistentPathForSource(ctx, ctx.ModuleDir(), *d.properties.Src)
 
+	// Make the _compilation_ of rdeps have an order-only dep on cc_api_library.src (an .so file)
+	// The .so file itself has an order-only dependency on the headers contributed by this library.
+	// Creating this dependency ensures that the headers are assembled before compilation of rdeps begins.
+	d.libraryDecorator.reexportDeps(in)
+	d.libraryDecorator.flagExporter.setProvider(ctx)
+
 	d.unstrippedOutputFile = in
 	libName := d.libraryDecorator.getLibName(ctx) + flags.Toolchain.ShlibSuffix()