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

Commit c62a5107 authored by Paul Duffin's avatar Paul Duffin
Browse files

Discard duplicate operations to copy files to snapshot 

Header include directories are copied into the snapshot separately for
each cc library that exports them. However, the same include
directories can be exported by multiple libraries which caused ninja
error because two separate rules (albeit identical) were defined to
create the same files.

This avoids the duplicate ninja rules by detecting and discarding
duplicate copies, i.e. where the source and destination are the same.
It will also report an error if two or more different source files are
copied to the same destination.

Bug: 142918168
Test: m nothing
      added test and verified it produced two identical copy rules
      fixed code and verified duplicate copy rules had been eliminated

Change-Id: I39e37405035bee5093f96e03248e9e29ed30962c
parent ac6e608d

sdk/cc_sdk_test.go

+39 −0
Original line number Diff line number Diff line
@@ -142,6 +142,45 @@ func TestBasicSdkWithCc(t *testing.T) { 
	ensureListContains(t, pathsToStrings(cpplibForMyApex2.Rule("ld").Implicits), sdkMemberV2.String())

}



func TestSnapshotWithCcDuplicateHeaders(t *testing.T) {

	result := testSdkWithCc(t, `

		sdk {

			name: "mysdk",

			native_shared_libs: ["mynativelib1", "mynativelib2"],

		}



		cc_library_shared {

			name: "mynativelib1",

			srcs: [

				"Test.cpp",

			],

			export_include_dirs: ["include"],

			system_shared_libs: [],

			stl: "none",

		}



		cc_library_shared {

			name: "mynativelib2",

			srcs: [

				"Test.cpp",

			],

			export_include_dirs: ["include"],

			system_shared_libs: [],

			stl: "none",

		}

	`)



	result.CheckSnapshot("mysdk", "android_common", "",

		checkAllCopyRules(`

include/Test.h -> include/include/Test.h

.intermediates/mynativelib1/android_arm64_armv8-a_core_shared/mynativelib1.so -> arm64/lib/mynativelib1.so

.intermediates/mynativelib1/android_arm_armv7-a-neon_core_shared/mynativelib1.so -> arm/lib/mynativelib1.so

.intermediates/mynativelib2/android_arm64_armv8-a_core_shared/mynativelib2.so -> arm64/lib/mynativelib2.so

.intermediates/mynativelib2/android_arm_armv7-a-neon_core_shared/mynativelib2.so -> arm/lib/mynativelib2.so

`),

	)

}



func TestSnapshotWithCcShared(t *testing.T) {

	result := testSdkWithCc(t, `

		sdk {

sdk/update.go

+22 −7
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ func (s *sdk) buildSnapshot(ctx android.ModuleContext) android.OutputPath { 
		sdk:             s,

		version:         "current",

		snapshotDir:     snapshotDir.OutputPath,

		copies:          make(map[string]string),

		filesToZip:      []android.Path{bp.path},

		bpFile:          bpFile,

		prebuiltModules: make(map[string]*bpModule),
@@ -337,6 +338,11 @@ type snapshotBuilder struct { 
	version     string

	snapshotDir android.OutputPath

	bpFile      *bpFile



	// Map from destination to source of each copy - used to eliminate duplicates and

	// detect conflicts.

	copies map[string]string



	filesToZip  android.Paths

	zipsToMerge android.Paths
@@ -345,6 +351,12 @@ type snapshotBuilder struct { 
}



func (s *snapshotBuilder) CopyToSnapshot(src android.Path, dest string) {

	if existing, ok := s.copies[dest]; ok {

		if existing != src.String() {

			s.ctx.ModuleErrorf("conflicting copy, %s copied from both %s and %s", dest, existing, src)

			return

		}

	} else {

		path := s.snapshotDir.Join(s.ctx, dest)

		s.ctx.Build(pctx, android.BuildParams{

			Rule:   android.Cp,
@@ -352,6 +364,9 @@ func (s *snapshotBuilder) CopyToSnapshot(src android.Path, dest string) { 
			Output: path,

		})

		s.filesToZip = append(s.filesToZip, path)



		s.copies[dest] = src.String()

	}

}



func (s *snapshotBuilder) UnzipToSnapshot(zipPath android.Path, destDir string) {